diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-24 15:25:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-24 15:25:51 -0400 |
| commit | 36099365c7cc64e5184b66b6eb094950a13f540c (patch) | |
| tree | c91b9f3719f94864a62f2d15a71aaecd54c56711 /drivers/net/wireless/mwifiex/txrx.c | |
| parent | 22c8c9343258feda9ea9ebb9e5f8cbb727b69454 (diff) | |
| parent | f70490e6078abe1182437e629f67a7f0b6f08cd4 (diff) | |
| download | op-kernel-dev-36099365c7cc64e5184b66b6eb094950a13f540c.zip op-kernel-dev-36099365c7cc64e5184b66b6eb094950a13f540c.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/rtlwifi/pci.c
include/linux/netlink.h
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 aaa50c0..6190b2f 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 = |
