From 7dce92eaed50abc11f65595f639a8f75b5f577ba Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 19 Sep 2010 13:01:02 +0300 Subject: [PATCH] --- yaml --- r: 219945 b: refs/heads/master c: 80a284bd154ee3a9d38ee9c264a3a2bf6114385e h: refs/heads/master i: 219943: 4646ff1cb409f2e2a02a7b64e33a3563ccffd821 v: v3 --- [refs] | 2 +- trunk/drivers/staging/winbond/mlmetxrx.c | 13 ++++++------- trunk/drivers/staging/winbond/mlmetxrx_f.h | 3 +-- trunk/drivers/staging/winbond/wbusb.c | 4 +--- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index c474f5435dd3..56b773f9ffc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff80d13fc45b97bb06dcb57036c768c8d3674d7d +refs/heads/master: 80a284bd154ee3a9d38ee9c264a3a2bf6114385e diff --git a/trunk/drivers/staging/winbond/mlmetxrx.c b/trunk/drivers/staging/winbond/mlmetxrx.c index 74488c2f8c95..6b28898485d6 100644 --- a/trunk/drivers/staging/winbond/mlmetxrx.c +++ b/trunk/drivers/staging/winbond/mlmetxrx.c @@ -19,14 +19,13 @@ #include "mds_f.h" -/* ============================================================================= */ -u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 *pMMPDU, u16 len, u8 DataType) -/* DataType : FRAME_TYPE_802_11_MANAGEMENT, FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE, - FRAME_TYPE_802_11_DATA */ +#include + +int MLMESendFrame(struct wbsoft_priv *adapter, u8 *pMMPDU, u16 len, u8 DataType) { if (adapter->sMlmeFrame.IsInUsed != PACKET_FREE_TO_USE) { adapter->sMlmeFrame.wNumTxMMPDUDiscarded++; - return false; + return NETDEV_TX_BUSY; } adapter->sMlmeFrame.IsInUsed = PACKET_COME_FROM_MLME; @@ -40,9 +39,9 @@ u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 *pMMPDU, u16 len, u8 DataType) /* 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. */ - /* Transmit NDIS packet */ Mds_Tx(adapter); - return true; + + return NETDEV_TX_OK; } void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *desc) diff --git a/trunk/drivers/staging/winbond/mlmetxrx_f.h b/trunk/drivers/staging/winbond/mlmetxrx_f.h index d1aa2617d24b..ddccbc2e1cd2 100644 --- a/trunk/drivers/staging/winbond/mlmetxrx_f.h +++ b/trunk/drivers/staging/winbond/mlmetxrx_f.h @@ -11,8 +11,7 @@ #include "core.h" void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes); -u8 MLMESendFrame(struct wbsoft_priv *adapter, - u8 *pMMPDU, u16 len, u8 DataType); +int MLMESendFrame(struct wbsoft_priv *adapter, u8 *pMMPDU, u16 len, u8 DataType); void MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID, diff --git a/trunk/drivers/staging/winbond/wbusb.c b/trunk/drivers/staging/winbond/wbusb.c index 5419f4fd198f..157c05bf2578 100644 --- a/trunk/drivers/staging/winbond/wbusb.c +++ b/trunk/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)