w35und: Use NETDEV_TX_BUSY if MLMESendFrame fails
PATCH 1/2 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 <[email protected]>
Cc Lars Lindley <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Ruslan Pisarev <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
--- drivers/staging/winbond/mlmetxrx.c | 13 ++++++------- drivers/staging/winbond/mlmetxrx_f.h | 3 +-- drivers/staging/winbond/wbusb.c | 4 +--- 3 files changed, 8 insertions(+), 12 deletions(-)
drivers/staging/winbond/mlmetxrx.c +6 -7
@@ -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 <linux/netdevice.h> + +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)
drivers/staging/winbond/mlmetxrx_f.h +1 -2
@@ -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,
drivers/staging/winbond/wbusb.c +1 -3
@@ -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)
Signature · 1 line
1.6.3.3
PATCH 2/2 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 <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Ruslan Pisarev <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
--- drivers/staging/winbond/mlmetxrx.c | 25 ------------------------- drivers/staging/winbond/mlmetxrx_f.h | 1 - drivers/staging/winbond/wbusb.c | 21 ++++++++++++++++++++- 3 files changed, 20 insertions(+), 27 deletions(-)
drivers/staging/winbond/mlmetxrx.c +0 -25
@@ -19,31 +19,6 @@#include "mds_f.h" -#include <linux/netdevice.h> - -int MLMESendFrame (struct wbsoft_priv *adapter,u8 *pMMPDU,u16 len,u8 DataType) -{ -if (adapter->sMlmeFrame.IsInUsed !=PACKET_FREE_TO_USE ) { - adapter->sMlmeFrame.wNumTxMMPDUDiscarded++; -return NETDEV_TX_BUSY ; - } - adapter->sMlmeFrame.IsInUsed =PACKET_COME_FROM_MLME ; - -/* Keep information for sending */ - adapter->sMlmeFrame.pMMPDU = pMMPDU; - adapter->sMlmeFrame.DataType = DataType; -/* len must be the last setting due to QUERY_SIZE_SECOND of Mds */ - adapter->sMlmeFrame.len = len; - adapter->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 (adapter); - -return NETDEV_TX_OK ; -} -void MLME_GetNextPacket (struct wbsoft_priv *adapter,struct wb35_descriptor *desc) { desc->InternalUsed = desc->buffer_start_index + desc->buffer_number;
drivers/staging/winbond/mlmetxrx_f.h +0 -1
@@ -11,7 +11,6 @@#include "core.h" void MLME_GetNextPacket (struct wbsoft_priv *adapter,struct wb35_descriptor *pDes); -int MLMESendFrame (struct wbsoft_priv *adapter,u8 *pMMPDU,u16 len,u8 DataType); void MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID,
drivers/staging/winbond/wbusb.c +20 -1
@@ -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)
Signature · 1 line
1.6.3.3