From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F3AE1BD50F for ; Tue, 6 Aug 2024 11:04:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722942284; cv=none; b=fJNB+HHWHwa5hafns2wfCI3jBGQBIt+tvbfyZue9jIjWK8pwo5XZf5k7aedIy7M+Q5MirckZBRKSR97oJ42PuR8LFiEv9oSLIWy5X1iuh0lHQhk5DvP6zIkf8lotNjTVfgaA4TvyHvBMm3Ln5Z0UNBwqROP+c5LcVWcaRomGGWc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722942284; c=relaxed/simple; bh=c4xKF9EFqwa7Eg2Awhq8zwH3ncTbgXM7e92R62jcPNk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=CVRVqZ3o7F/kmgpBg4Fky71y3vK9eCezPPD7FCLBBC+f9O1Be1BlNZKIYw95zHszhgx33TGakt6fc8k/8v8J17WGit+fwSy7YE7Y+5hBq+wfypopDB1yhE5A3dF7WEeoHKmdIKWuFyhML+N6dHrvm93XahGzi0CAp8401AvFfgw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=HQ8sCOC8; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HQ8sCOC8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722942282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=sLO0GFLtC0/RCpuHKysGRgafRy8oEPXNMF1zIFnu4R4=; b=HQ8sCOC80za7jOT97j5fSbsxqr0Vvi/NMG6mVDJaHTWxgjrCnEL4WyQYXgMzXF/pgcbCNZ 9+qGXhbPOC16Sogk7lE7Q9SDK/JcPyl7JL0OQdi7toE+sIpaqeyoC7lAARORhcTph2yiEp 2DphFjqUQ16NG33lbKb/kCTvqfC4U/E= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-wZMVvew7PQOH3HpUpDZlVQ-1; Tue, 06 Aug 2024 07:04:41 -0400 X-MC-Unique: wZMVvew7PQOH3HpUpDZlVQ-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-42820c29a76so3533905e9.2 for ; Tue, 06 Aug 2024 04:04:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722942279; x=1723547079; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=sLO0GFLtC0/RCpuHKysGRgafRy8oEPXNMF1zIFnu4R4=; b=BGWqh1Qo/T8xZAzWSxv6ri4+raQoqphZgwZAeOv7xo/q5bjyJBhXCmlP8ZmXEvdgtk /QBgOQu26qQKAHs3RI+bd4PBAQCOOqid6DlbfFVXdoA4hU67wKmfbm/80S172UE4pVU7 BGz7wZpz7NszQEl2sy/p6OGdr4MWhX7VZ81BMx6+a2o9Er9+1oh/LX88IJimxQG+nkRi aAQagLj5SNVUmvdobIzgkLeRZgnqQDxrQR1Iio8/ySEL44JddpgEjqDdMvTo/Z+RJVqw BAeYUQfcJXRnK5/yQoqwvSGt8tnmb3Hq3vz+UQktNFuiAhyKdx3kyVaZPpNZ9PpsSzOz kpig== X-Forwarded-Encrypted: i=1; AJvYcCWKO5KF2P9VRs5Iu/Yd7nAsNMU4x7f4SMzMdXTxWx11xv4VVs7JNzb+wMhDX0aXr//uEXr3S2pXac6bRRcDD6hRnp9GGC5U X-Gm-Message-State: AOJu0Yx3JokIQ99oaZF+n8oKz/TLEtiFRoenhKozslBs9MzQmt5o/qf9 bKiiR/FvuZf2n24KofUDPHQbrMiYjToeNqCnO+5ZoixRe0qXX7TLG5BPBoC7W/P5TrL4lkGOTAo l3JVs5zycnDjjDQaJIaLF000tT732likILUlpYRkiOP0WWPRoAvDHWQ== X-Received: by 2002:a05:600c:1546:b0:426:5f0b:a49b with SMTP id 5b1f17b1804b1-428e6b7c1aemr108511845e9.23.1722942278902; Tue, 06 Aug 2024 04:04:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqIgPzQp8aE9L2eNg2nsXsX1CiCpuwVjIveNT+MoC2Hiz6BBfy9/LyQmgMTdGvjH0s74T53g== X-Received: by 2002:a05:600c:1546:b0:426:5f0b:a49b with SMTP id 5b1f17b1804b1-428e6b7c1aemr108511335e9.23.1722942277893; Tue, 06 Aug 2024 04:04:37 -0700 (PDT) Received: from debian ([2001:4649:f075:0:a45e:6b9:73fc:f9aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-428e6e3174bsm175059375e9.21.2024.08.06.04.04.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 04:04:37 -0700 (PDT) Date: Tue, 6 Aug 2024 13:04:34 +0200 From: Guillaume Nault To: Simon Horman Cc: hhorace , johannes@sipsolutions.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Ido Schimmel Subject: Re: [PATCH] wifi: cfg80211: fix bug of mapping AF3x to incorrect User Priority Message-ID: References: <20240805071743.2112-1-hhoracehsu@gmail.com> <20240806090844.GR2636630@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240806090844.GR2636630@kernel.org> On Tue, Aug 06, 2024 at 10:08:44AM +0100, Simon Horman wrote: > + Guillaume and Ido > > On Mon, Aug 05, 2024 at 03:17:42PM +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). > > > > Signed-off-by: hhorace > > Adding Guillaume and Ido as this relates to DSCP. Thanks. The patch looks good to me (only missing a Fixes tag). Just a note to hhorace: the entry for CS5 (case 40) is useless as CS5 is 101000. So the value of the 3 high order bits already is 5 (in case you want to make a followup patch for net-next). Fixes: 6fdb8b8781d5 ("wifi: cfg80211: Update the default DSCP-to-UP mapping") Reviewed-by: Guillaume Nault > > --- > > net/wireless/util.c | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/net/wireless/util.c b/net/wireless/util.c > > index 082c6f9..4e04618 100644 > > --- a/net/wireless/util.c > > +++ b/net/wireless/util.c > > @@ -998,7 +998,6 @@ 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 > > @@ -1026,6 +1025,12 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb, > > /* Broadcasting video: CS3 */ > > ret = 4; > > break; > > + case 26: > > + case 28: > > + case 30: > > + /* Multimedia Streaming: AF31, AF32, AF33 */ > > + ret = 4; > > + break; > > case 40: > > /* Signaling: CS5 */ > > ret = 5; > > -- > > 2.42.0.windows.2 > > > > >