Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp1016983rwl; Fri, 24 Mar 2023 05:18:44 -0700 (PDT) X-Google-Smtp-Source: AKy350afkDG18joR+EEn9eCDeRk9HFO/XvbkwhntEBQkunaUctgmuptIe7FLuJ++S2rh+UKY1/zi X-Received: by 2002:a17:903:230b:b0:1a0:4fb2:6623 with SMTP id d11-20020a170903230b00b001a04fb26623mr3030363plh.40.1679660324229; Fri, 24 Mar 2023 05:18:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679660324; cv=none; d=google.com; s=arc-20160816; b=hcorJo4z/Cdmzbm06QKC2UhSmROeFJHGW8FvSl1eRJXTbXt5Q6B/XkGh+aAQgVtkpH VQeOFP7wc8qZ88BgpcF/VzrXvGNU2237jsbwsuOGeqUfot2FRGjk5ph8QfafLRP9hbLe BRZ/yIQ1BTWU16cSp+m8Dq7zMpJ4aJTSreWgfvEUMwww12Sb/s6TkOrw4uzVf0XfrSRh 4TsefiIBn0ck5sBdqhyLDF4GTRul5KgpzHTIKJPik+w/zi1tna986oICruOPyQES4b1f LsBSfyn+S4j5xdTcCtHiFCMMfXJBK3DyewOXNTnyKdMHXnZTZ3i3kcQ6hIvFVK46xytC Ilzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fOvWabSuRLP9OBhyLAI8L87vxn+Ghd+Lexe1ePH9NFc=; b=sz0Zb0LV1ZGyACZ6XOFRgaE7wE3uQjrVHxe91iafkDrwy7IhtiBPSdBLSlZpCsTKOG o42bpKBqfINTooOe6OfZyoZipWvfx4WiIbBpanuqCYl9YC5mikegdBAJFMVjCRv5C3jo c4vrMwIFGcaIkZEk+NyOYtyt2l0D3/nQIqJFV/HUwpPaLBcK+oBXKixVeWteZBEA26jT 83jOC7iIhQsQjRu6oMtx/aLK6E94M+ZU4FNsmNmMmPuYLjiqwJtaE2FyFM19ZCD1xDzi qRJCiNAUN2iktStGeBlDq2PyEkk5TyyEes7IOefXe9N+m+fEeB5IVBNKkkSuUkGun3Ss im9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@nbd.name header.s=20160729 header.b=CXBbGeAI; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nbd.name Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a4-20020a636604000000b004d09ab32905si20094858pgc.256.2023.03.24.05.18.34; Fri, 24 Mar 2023 05:18:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@nbd.name header.s=20160729 header.b=CXBbGeAI; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nbd.name Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230357AbjCXMJc (ORCPT + 59 others); Fri, 24 Mar 2023 08:09:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231848AbjCXMJ2 (ORCPT ); Fri, 24 Mar 2023 08:09:28 -0400 Received: from nbd.name (nbd.name [46.4.11.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 209DA16AE3 for ; Fri, 24 Mar 2023 05:09:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=fOvWabSuRLP9OBhyLAI8L87vxn+Ghd+Lexe1ePH9NFc=; b=CXBbGeAIm9YbLxlMem7Ir5SPNO AoqtlyEn08JCe7JNHyCaQdjVb61VgW5gHkOhzjtW//Nl87cVqKI34Dc1SZVGXHLPk3vVI/EeSTCEb VGYsRBGWTWlgmbs3yTjcB/qlZ9JBj5ckqGOZqe4zPiaWmUFoZGVOltaM4exGbGz7MLn4=; Received: from p54ae9730.dip0.t-ipconnect.de ([84.174.151.48] helo=localhost.localdomain) by ds12 with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 (Exim 4.94.2) (envelope-from ) id 1pfgEX-006Liq-9f; Fri, 24 Mar 2023 13:09:25 +0100 From: Felix Fietkau To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net Subject: [PATCH 2/3] wifi: mac80211: fix flow dissection for forwarded packets Date: Fri, 24 Mar 2023 13:09:23 +0100 Message-Id: <20230324120924.38412-2-nbd@nbd.name> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230324120924.38412-1-nbd@nbd.name> References: <20230324120924.38412-1-nbd@nbd.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Adjust the network header to point at the correct payload offset Fixes: 986e43b19ae9 ("wifi: mac80211: fix receiving A-MSDU frames on mesh interfaces") Signed-off-by: Felix Fietkau --- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 4be80c7dda95..bab839a0f59a 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2850,7 +2850,7 @@ ieee80211_rx_mesh_data(struct ieee80211_sub_if_data *sdata, struct sta_info *sta hdrlen += ETH_ALEN; else fwd_skb->protocol = htons(fwd_skb->len - hdrlen); - skb_set_network_header(fwd_skb, hdrlen); + skb_set_network_header(fwd_skb, hdrlen + 2); info = IEEE80211_SKB_CB(fwd_skb); memset(info, 0, sizeof(*info)); -- 2.39.0