]> www.infradead.org Git - nvme.git/commitdiff
wifi: iwlwifi: mvm: set properly mac header
authorMordechay Goodstein <mordechay.goodstein@intel.com>
Fri, 10 May 2024 14:06:35 +0000 (17:06 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 29 May 2024 13:30:13 +0000 (15:30 +0200)
In the driver we only use skb_put* for adding data to the skb, hence data
never moves and skb_reset_mac_haeder would set mac_header to the first
time data was added and not to mac80211 header, fix this my using the
actual len of bytes added for setting the mac header.

Fixes: 3f7a9d577d47 ("wifi: iwlwifi: mvm: simplify by using SKB MAC header pointer")
Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240510170500.12f2de2909c3.I72a819b96f2fe55bde192a8fd31a4b96c301aa73@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c

index d78af29281522ee756b3a9a3d412e673d70106ed..489cfb0a4ab1ecb77672cb22a2c1277c52266406 100644 (file)
@@ -2450,8 +2450,11 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,
         *
         * We mark it as mac header, for upper layers to know where
         * all radio tap header ends.
+        *
+        * Since data doesn't move data while putting data on skb and that is
+        * the only way we use, data + len is the next place that hdr would be put
         */
-       skb_reset_mac_header(skb);
+       skb_set_mac_header(skb, skb->len);
 
        /*
         * Override the nss from the rx_vec since the rate_n_flags has