merge r12883-12886 to 8.09
[openwrt/svn-archive/archive.git] / package / madwifi / patches / 406-monitor_r3711.patch
1 --- a/ath/if_ath.c
2 +++ b/ath/if_ath.c
3 @@ -6440,7 +6440,7 @@
4
5 /* Never copy the SKB, as it is ours on the RX side, and this is the
6 * last process on the TX side and we only modify our own headers. */
7 - tskb = ath_skb_removepad(skb, 0 /* Copy SKB */);
8 + tskb = ath_skb_removepad(skb, !tx /* Copy SKB */);
9 if (tskb == NULL) {
10 DPRINTF(sc, ATH_DEBUG_ANY,
11 "Dropping; ath_skb_removepad failed!\n");
12 @@ -6448,6 +6448,8 @@
13 }
14
15 ieee80211_input_monitor(ic, tskb, bf, tx, tsf, sc);
16 + if (tskb != skb)
17 + ieee80211_dev_kfree_skb(&tskb);
18 }
19
20 /*