Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11c9a55d authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

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: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 80a284bd

drivers/staging/winbond/mlmetxrx.c

+0 −25
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)