diff options
author | David S. Miller <davem@davemloft.net> | 2012-09-30 02:30:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-30 02:30:16 -0400 |
commit | a248afdc1b5916c2bfd007233112333d85aa28f6 (patch) | |
tree | 49d4a0b8fdcf7624ea6b0bdf0af2567d7392210e /drivers/net/wireless/iwlegacy/common.c | |
parent | d379142bc4d9b78cdd9fc5aa696ca1ea083fb7d4 (diff) | |
parent | c487606f835a93a725bac1aefd536be98f22474d (diff) |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
Here is another batch of updates intended for 3.7...
Highlights include an hci_connect re-write in Bluetooth, HCI/LLC
layer separation in NFC, removal of the raw pn544 NFC driver, NFC LLCP
raw sockets support, improved IBSS auth frame handling in mac80211,
full-MAC AP mode notification support in mac80211, a lot of attention
paid to brcmfmac, and the usual level of updates to iwlwifi, ath9k,
mwifiex, and rt2x00, and various other updates.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index eb9987520d61..318ed3c9fe74 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c | |||
@@ -1586,9 +1586,9 @@ il_fill_probe_req(struct il_priv *il, struct ieee80211_mgmt *frame, | |||
1586 | return 0; | 1586 | return 0; |
1587 | 1587 | ||
1588 | frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ); | 1588 | frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ); |
1589 | memcpy(frame->da, il_bcast_addr, ETH_ALEN); | 1589 | eth_broadcast_addr(frame->da); |
1590 | memcpy(frame->sa, ta, ETH_ALEN); | 1590 | memcpy(frame->sa, ta, ETH_ALEN); |
1591 | memcpy(frame->bssid, il_bcast_addr, ETH_ALEN); | 1591 | eth_broadcast_addr(frame->bssid); |
1592 | frame->seq_ctrl = 0; | 1592 | frame->seq_ctrl = 0; |
1593 | 1593 | ||
1594 | len += 24; | 1594 | len += 24; |