diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-24 14:21:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-24 14:21:00 -0700 |
| commit | cd5f3e2064ea21e1cbe140728a1b04e7d32f68eb (patch) | |
| tree | c2d924b975bdf6fd294546ffb800116c508878e7 /drivers/net/wireless/mwifiex/txrx.c | |
| parent | 95cb3656c09fcf6577138337216c27744ebc91e2 (diff) | |
| parent | 36099365c7cc64e5184b66b6eb094950a13f540c (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/mwifiex/txrx.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/txrx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c index aaa50c07419..6190b2fa57a 100644 --- a/drivers/net/wireless/mwifiex/txrx.c +++ b/drivers/net/wireless/mwifiex/txrx.c @@ -71,7 +71,7 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb, u8 *head_ptr; struct txpd *local_tx_pd = NULL; - head_ptr = (u8 *) mwifiex_process_sta_txpd(priv, skb); + head_ptr = mwifiex_process_sta_txpd(priv, skb); if (head_ptr) { if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA) local_tx_pd = |