diff options
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 22bc9f17f634..57eb5b649730 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -3203,7 +3203,7 @@ static void b43_tx_work(struct work_struct *work) | |||
3203 | mutex_unlock(&wl->mutex); | 3203 | mutex_unlock(&wl->mutex); |
3204 | } | 3204 | } |
3205 | 3205 | ||
3206 | static int b43_op_tx(struct ieee80211_hw *hw, | 3206 | static void b43_op_tx(struct ieee80211_hw *hw, |
3207 | struct sk_buff *skb) | 3207 | struct sk_buff *skb) |
3208 | { | 3208 | { |
3209 | struct b43_wl *wl = hw_to_b43_wl(hw); | 3209 | struct b43_wl *wl = hw_to_b43_wl(hw); |
@@ -3211,14 +3211,12 @@ static int b43_op_tx(struct ieee80211_hw *hw, | |||
3211 | if (unlikely(skb->len < 2 + 2 + 6)) { | 3211 | if (unlikely(skb->len < 2 + 2 + 6)) { |
3212 | /* Too short, this can't be a valid frame. */ | 3212 | /* Too short, this can't be a valid frame. */ |
3213 | dev_kfree_skb_any(skb); | 3213 | dev_kfree_skb_any(skb); |
3214 | return NETDEV_TX_OK; | 3214 | return; |
3215 | } | 3215 | } |
3216 | B43_WARN_ON(skb_shinfo(skb)->nr_frags); | 3216 | B43_WARN_ON(skb_shinfo(skb)->nr_frags); |
3217 | 3217 | ||
3218 | skb_queue_tail(&wl->tx_queue, skb); | 3218 | skb_queue_tail(&wl->tx_queue, skb); |
3219 | ieee80211_queue_work(wl->hw, &wl->tx_work); | 3219 | ieee80211_queue_work(wl->hw, &wl->tx_work); |
3220 | |||
3221 | return NETDEV_TX_OK; | ||
3222 | } | 3220 | } |
3223 | 3221 | ||
3224 | static void b43_qos_params_upload(struct b43_wldev *dev, | 3222 | static void b43_qos_params_upload(struct b43_wldev *dev, |