wifi: cfg80211: fix bug of mapping AF3x to incorrect User Priority

[PATCH wireless-next v2] wifi: cfg80211: fix bug of mapping AF3x to incorrect User Priority

Posted by hhorace 1 year, 4 months ago

According to RFC8325 4.3, Multimedia Streaming: AF31(011010, 26),
AF32(011100, 28), AF33(011110, 30) maps to User Priority = 4
and AC_VI (Video).

However, the original code remain the default three Most Significant
Bits (MSBs) of the DSCP, which makes AF3x map to User Priority = 3
and AC_BE (Best Effort).

Fixes: 6fdb8b8781d5 ("wifi: cfg80211: Update the default DSCP-to-UP mapping")
Signed-off-by: hhorace <hhoracehsu@gmail.com>
---
Changes in v2:
- Remove the useless entry for CS5 (case 40) since the value of the 3
 high order bits is already 5.

 net/wireless/util.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 082c6f9..c6d0397 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -998,10 +998,10 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb,
 	 * Diffserv Service Classes no update is needed:
 	 * - Standard: DF
 	 * - Low Priority Data: CS1
-	 * - Multimedia Streaming: AF31, AF32, AF33
 	 * - Multimedia Conferencing: AF41, AF42, AF43
 	 * - Network Control Traffic: CS7
 	 * - Real-Time Interactive: CS4
+	 * - Signaling: CS5
 	 */
 	switch (dscp >> 2) {
 	case 10:
@@ -1026,9 +1026,11 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb,
 		/* Broadcasting video: CS3 */
 		ret = 4;
 		break;
-	case 40:
-		/* Signaling: CS5 */
-		ret = 5;
+	case 26:
+	case 28:
+	case 30:
+		/* Multimedia Streaming: AF31, AF32, AF33 */
+		ret = 4;
 		break;
 	case 44:
 		/* Voice Admit: VA */
-- 
2.42.0.windows.2

Re: [PATCH wireless-next v2] wifi: cfg80211: fix bug of mapping AF3x to incorrect User Priority

Posted by Johannes Berg 1 year, 4 months ago

On Wed, 2024-08-07 at 16:22 +0800, hhorace wrote:
> According to RFC8325 4.3, Multimedia Streaming: AF31(011010, 26),
> AF32(011100, 28), AF33(011110, 30) maps to User Priority = 4
> and AC_VI (Video).
> 
> However, the original code remain the default three Most Significant
> Bits (MSBs) of the DSCP, which makes AF3x map to User Priority = 3
> and AC_BE (Best Effort).
> 
> Fixes: 6fdb8b8781d5 ("wifi: cfg80211: Update the default DSCP-to-UP mapping")
> Signed-off-by: hhorace <hhoracehsu@gmail.com>

^^^ looks more like a username, is that really your name/"known
identity"?

https://www.kernel.org/doc/html/latest/process/submitting-patches.html#sign-your-work-the-developer-s-certificate-of-origin

johannes

Re: [PATCH wireless-next v2] wifi: cfg80211: fix bug of mapping AF3x to incorrect User Priority

Posted by Ido Schimmel 1 year, 4 months ago

On Wed, Aug 07, 2024 at 04:22:05PM +0800, hhorace wrote:
> According to RFC8325 4.3, Multimedia Streaming: AF31(011010, 26),
> AF32(011100, 28), AF33(011110, 30) maps to User Priority = 4
> and AC_VI (Video).
> 
> However, the original code remain the default three Most Significant
> Bits (MSBs) of the DSCP, which makes AF3x map to User Priority = 3
> and AC_BE (Best Effort).
> 
> Fixes: 6fdb8b8781d5 ("wifi: cfg80211: Update the default DSCP-to-UP mapping")
> Signed-off-by: hhorace <hhoracehsu@gmail.com>

Reviewed-by: Ido Schimmel <idosch@nvidia.com>

Re: [PATCH wireless-next v2] wifi: cfg80211: fix bug of mapping AF3x to incorrect User Priority

Posted by Guillaume Nault 1 year, 4 months ago

On Wed, Aug 07, 2024 at 04:22:05PM +0800, hhorace wrote:
> According to RFC8325 4.3, Multimedia Streaming: AF31(011010, 26),
> AF32(011100, 28), AF33(011110, 30) maps to User Priority = 4
> and AC_VI (Video).
> 
> However, the original code remain the default three Most Significant
> Bits (MSBs) of the DSCP, which makes AF3x map to User Priority = 3
> and AC_BE (Best Effort).
> 

Reviewed-by: Guillaume Nault <gnault@redhat.com>