diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-09-19 13:01:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-21 10:46:03 -0700 |
| commit | 80a284bd154ee3a9d38ee9c264a3a2bf6114385e (patch) | |
| tree | 2e45c166f005b365323185995b94494c22382a1c /drivers/staging/winbond/wbusb.c | |
| parent | ff80d13fc45b97bb06dcb57036c768c8d3674d7d (diff) | |
| download | kernel_samsung_smdk4412-80a284bd154ee3a9d38ee9c264a3a2bf6114385e.zip kernel_samsung_smdk4412-80a284bd154ee3a9d38ee9c264a3a2bf6114385e.tar.gz kernel_samsung_smdk4412-80a284bd154ee3a9d38ee9c264a3a2bf6114385e.tar.bz2 | |
staging: w35und: Use NETDEV_TX_BUSY if MLMESendFrame fails
This patch changes MLMESendFrame to return NETDEV_TX_BUSY if MLME frame is in
use so that wbsoft_tx() doesn't blindly return NETDEV_TX_OK in that case.
Cc: Sandro Bonazzola <sandro.bonazzola@gmail.com>
Cc: Lars Lindley <lindley@coyote.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond/wbusb.c')
| -rw-r--r-- | drivers/staging/winbond/wbusb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c index 5419f4f..157c05b 100644 --- a/drivers/staging/winbond/wbusb.c +++ b/drivers/staging/winbond/wbusb.c @@ -121,9 +121,7 @@ static int wbsoft_tx(struct ieee80211_hw *dev, struct sk_buff *skb) { struct wbsoft_priv *priv = dev->priv; - MLMESendFrame(priv, skb->data, skb->len, FRAME_TYPE_802_11_MANAGEMENT); - - return NETDEV_TX_OK; + return MLMESendFrame(priv, skb->data, skb->len, FRAME_TYPE_802_11_MANAGEMENT); } static int wbsoft_start(struct ieee80211_hw *dev) |