diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-31 15:22:17 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-31 15:22:17 -0400 |
| commit | 96da266e77637ae892b196f377908c51fa9f2d1a (patch) | |
| tree | bf3da12850bbd46082add3060f9a5253aed144e0 /drivers/net/wireless/mwifiex/tdls.c | |
| parent | 9109e17f7c3ace48629397b44db5ce06bf168644 (diff) | |
| parent | a31267c30880ebdc73e6815f58c69a665052fab8 (diff) | |
| download | blackbird-op-linux-96da266e77637ae892b196f377908c51fa9f2d1a.tar.gz blackbird-op-linux-96da266e77637ae892b196f377908c51fa9f2d1a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex/tdls.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/tdls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/tdls.c b/drivers/net/wireless/mwifiex/tdls.c index 8cec6e4ba8c4..97662a1ba58c 100644 --- a/drivers/net/wireless/mwifiex/tdls.c +++ b/drivers/net/wireless/mwifiex/tdls.c @@ -730,13 +730,13 @@ void mwifiex_process_tdls_action_frame(struct mwifiex_private *priv, if (len < (sizeof(struct ethhdr) + 3)) return; - if (*(u8 *)(buf + sizeof(struct ethhdr)) != WLAN_TDLS_SNAP_RFTYPE) + if (*(buf + sizeof(struct ethhdr)) != WLAN_TDLS_SNAP_RFTYPE) return; - if (*(u8 *)(buf + sizeof(struct ethhdr) + 1) != WLAN_CATEGORY_TDLS) + if (*(buf + sizeof(struct ethhdr) + 1) != WLAN_CATEGORY_TDLS) return; peer = buf + ETH_ALEN; - action = *(u8 *)(buf + sizeof(struct ethhdr) + 2); + action = *(buf + sizeof(struct ethhdr) + 2); /* just handle TDLS setup request/response/confirm */ if (action > WLAN_TDLS_SETUP_CONFIRM) |
