diff options
| author | Vasanthakumar Thiagarajan | 2011-11-04 11:18:51 +0100 |
|---|---|---|
| committer | Kalle Valo | 2011-11-11 12:00:01 +0100 |
| commit | a29517ce40e128bdf0794110bb4b18a984da7fb7 (patch) | |
| tree | ae11c2bf54ea028e480a091bd51846a3f400e407 | |
| parent | ath6kl: Remove few unused WMI stuff (diff) | |
| download | kernel-qcow2-linux-a29517ce40e128bdf0794110bb4b18a984da7fb7.tar.gz kernel-qcow2-linux-a29517ce40e128bdf0794110bb4b18a984da7fb7.tar.xz kernel-qcow2-linux-a29517ce40e128bdf0794110bb4b18a984da7fb7.zip | |
ath6kl: Fix tx packet drop in AP mode with bridge
skb is dropped in ath6kl_data_tx() when the headroom in skb
is insufficient. We hit this condition for every skb in AP mode
which is used with bridge, so all tx packets are getting dropped
when tried to send traffic to wireless client from bridge. Fix
this by reallocating the headroom instead of dropping the skb
when it has lesser headroom than needed.
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/txrx.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c index 6f1de4468a12..d9cff2b950b1 100644 --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c @@ -266,8 +266,14 @@ int ath6kl_data_tx(struct sk_buff *skb, struct net_device *dev) if (test_bit(WMI_ENABLED, &ar->flag)) { if (skb_headroom(skb) < dev->needed_headroom) { - WARN_ON(1); - goto fail_tx; + struct sk_buff *tmp_skb = skb; + + skb = skb_realloc_headroom(skb, dev->needed_headroom); + kfree_skb(tmp_skb); + if (skb == NULL) { + vif->net_stats.tx_dropped++; + return 0; + } } if (ath6kl_wmi_dix_2_dot3(ar->wmi, skb)) { |