aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/winbond
diff options
context:
space:
mode:
authorPekka Enberg <penberg@kernel.org>2010-09-19 13:01:03 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2010-09-21 10:46:03 -0700
commit11c9a55d08d3d79c7a690312966567f70758886a (patch)
tree7988e2306279e0c92ab76190c0c5562f4873bd7f /drivers/staging/winbond
parent80a284bd154ee3a9d38ee9c264a3a2bf6114385e (diff)
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')
-rw-r--r--drivers/staging/winbond/mlmetxrx.c25
-rw-r--r--drivers/staging/winbond/mlmetxrx_f.h1
-rw-r--r--drivers/staging/winbond/wbusb.c21
3 files changed, 20 insertions, 27 deletions
diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c
index 6b28898485d..7425a23f12e 100644
--- a/drivers/staging/winbond/mlmetxrx.c
+++ b/drivers/staging/winbond/mlmetxrx.c
@@ -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;
diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h
index ddccbc2e1cd..012507fc49e 100644
--- a/drivers/staging/winbond/mlmetxrx_f.h
+++ b/drivers/staging/winbond/mlmetxrx_f.h
@@ -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,
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 157c05bf257..3f60cf7e6ec 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)