git.openwrt.org Git - openwrt/staging/dedeckeh.git/blob

   1 From: Xing Song <xing.song@mediatek.com>
   2 Date: Tue, 23 Nov 2021 11:31:23 +0800
   3 Subject: [PATCH] mac80211: set up the fwd_skb->dev for mesh forwarding
   4
   5 Mesh forwarding requires that the fwd_skb->dev is set up for TX handling,
   6 otherwise the following warning will be generated, so set it up for the
   7 pending frames.
   8
   9 [   72.835674 ] WARNING: CPU: 0 PID: 1193 at __skb_flow_dissect+0x284/0x1298
  10 [   72.842379 ] Modules linked in: ksmbd pppoe ppp_async l2tp_ppp ...
  11 [   72.962020 ] CPU: 0 PID: 1193 Comm: kworker/u5:1 Tainted: P S 5.4.137 #0
  12 [   72.969938 ] Hardware name: MT7622_MT7531 RFB (DT)
  13 [   72.974659 ] Workqueue: napi_workq napi_workfn
  14 [   72.979025 ] pstate: 60000005 (nZCv daif -PAN -UAO)
  15 [   72.983822 ] pc : __skb_flow_dissect+0x284/0x1298
  16 [   72.988444 ] lr : __skb_flow_dissect+0x54/0x1298
  17 [   72.992977 ] sp : ffffffc010c738c0
  18 [   72.996293 ] x29: ffffffc010c738c0 x28: 0000000000000000
  19 [   73.001615 ] x27: 000000000000ffc2 x26: ffffff800c2eb818
  20 [   73.006937 ] x25: ffffffc010a987c8 x24: 00000000000000ce
  21 [   73.012259 ] x23: ffffffc010c73a28 x22: ffffffc010a99c60
  22 [   73.017581 ] x21: 000000000000ffc2 x20: ffffff80094da800
  23 [   73.022903 ] x19: 0000000000000000 x18: 0000000000000014
  24 [   73.028226 ] x17: 00000000084d16af x16: 00000000d1fc0bab
  25 [   73.033548 ] x15: 00000000715f6034 x14: 000000009dbdd301
  26 [   73.038870 ] x13: 00000000ea4dcbc3 x12: 0000000000000040
  27 [   73.044192 ] x11: 000000000eb00ff0 x10: 0000000000000000
  28 [   73.049513 ] x9 : 000000000eb00073 x8 : 0000000000000088
  29 [   73.054834 ] x7 : 0000000000000000 x6 : 0000000000000001
  30 [   73.060155 ] x5 : 0000000000000000 x4 : 0000000000000000
  31 [   73.065476 ] x3 : ffffffc010a98000 x2 : 0000000000000000
  32 [   73.070797 ] x1 : 0000000000000000 x0 : 0000000000000000
  33 [   73.076120 ] Call trace:
  34 [   73.078572 ]  __skb_flow_dissect+0x284/0x1298
  35 [   73.082846 ]  __skb_get_hash+0x7c/0x228
  36 [   73.086629 ]  ieee80211_txq_may_transmit+0x7fc/0x17b8 [mac80211]
  37 [   73.092564 ]  ieee80211_tx_prepare_skb+0x20c/0x268 [mac80211]
  38 [   73.098238 ]  ieee80211_tx_pending+0x144/0x330 [mac80211]
  39 [   73.103560 ]  tasklet_action_common.isra.16+0xb4/0x158
  40 [   73.108618 ]  tasklet_action+0x2c/0x38
  41 [   73.112286 ]  __do_softirq+0x168/0x3b0
  42 [   73.115954 ]  do_softirq.part.15+0x88/0x98
  43 [   73.119969 ]  __local_bh_enable_ip+0xb0/0xb8
  44 [   73.124156 ]  napi_workfn+0x58/0x90
  45 [   73.127565 ]  process_one_work+0x20c/0x478
  46 [   73.131579 ]  worker_thread+0x50/0x4f0
  47 [   73.135249 ]  kthread+0x124/0x128
  48 [   73.138484 ]  ret_from_fork+0x10/0x1c
  49
  50 Signed-off-by: Xing Song <xing.song@mediatek.com>
  51 ---
  52
  53 --- a/net/mac80211/rx.c
  54 +++ b/net/mac80211/rx.c
  55 @@ -2949,6 +2949,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
  56         if (!fwd_skb)
  57                 goto out;
  58
  59 +       fwd_skb->dev = sdata->dev;
  60         fwd_hdr =  (struct ieee80211_hdr *) fwd_skb->data;
  61         fwd_hdr->frame_control &= ~cpu_to_le16(IEEE80211_FCTL_RETRY);
  62         info = IEEE80211_SKB_CB(fwd_skb);