diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-09-19 13:01:03 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-21 10:46:03 -0700 |
| commit | 11c9a55d08d3d79c7a690312966567f70758886a (patch) | |
| tree | 7988e2306279e0c92ab76190c0c5562f4873bd7f /drivers/staging/winbond/wbusb.c | |
| parent | 80a284bd154ee3a9d38ee9c264a3a2bf6114385e (diff) | |
| download | kernel_samsung_smdk4412-11c9a55d08d3d79c7a690312966567f70758886a.zip kernel_samsung_smdk4412-11c9a55d08d3d79c7a690312966567f70758886a.tar.gz kernel_samsung_smdk4412-11c9a55d08d3d79c7a690312966567f70758886a.tar.bz2 | |
staging: w35und: Inline MLMESendFrame() to wbsoft_tx()
The wbsoft_tx() function is a simple wrapper on top of MLMESendFrame() so
inline the latter to the former.
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 | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c index 157c05b..3f60cf7 100644 --- a/drivers/staging/winbond/wbusb.c +++ b/drivers/staging/winbond/wbusb.c @@ -121,7 +121,26 @@ static int wbsoft_tx(struct ieee80211_hw *dev, struct sk_buff *skb) { struct wbsoft_priv *priv = dev->priv; - return MLMESendFrame(priv, skb->data, skb->len, FRAME_TYPE_802_11_MANAGEMENT); + if (priv->sMlmeFrame.IsInUsed != PACKET_FREE_TO_USE) { + priv->sMlmeFrame.wNumTxMMPDUDiscarded++; + return NETDEV_TX_BUSY; + } + + priv->sMlmeFrame.IsInUsed = PACKET_COME_FROM_MLME; + + priv->sMlmeFrame.pMMPDU = skb->data; + priv->sMlmeFrame.DataType = FRAME_TYPE_802_11_MANAGEMENT; + priv->sMlmeFrame.len = skb->len; + priv->sMlmeFrame.wNumTxMMPDU++; + + /* + * H/W will enter power save by set the register. S/W don't send null + * frame with PWRMgt bit enbled to enter power save now. + */ + + Mds_Tx(priv); + + return NETDEV_TX_OK; } static int wbsoft_start(struct ieee80211_hw *dev) |