summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-11-30 14:14:42 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-30 14:14:42 -0500
commit3b95e9c089d932c11f9ec03f7493f02cceff04ba (patch)
treeb4b5fac6f2f1908aebf49f63805f07f4ec58abb9 /net/wireless
parent5dc5503f5a400be5a7dc611745a034f04b0679b8 (diff)
parent2a1e0fd175dcfd72096ba9291d31e3b1b5342e60 (diff)
downloadblackbird-op-linux-3b95e9c089d932c11f9ec03f7493f02cceff04ba.tar.gz
blackbird-op-linux-3b95e9c089d932c11f9ec03f7493f02cceff04ba.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index b3a476fe8272..ffafda5022c2 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -89,8 +89,8 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
[NL80211_ATTR_IFINDEX] = { .type = NLA_U32 },
[NL80211_ATTR_IFNAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ-1 },
- [NL80211_ATTR_MAC] = { .type = NLA_BINARY, .len = ETH_ALEN },
- [NL80211_ATTR_PREV_BSSID] = { .type = NLA_BINARY, .len = ETH_ALEN },
+ [NL80211_ATTR_MAC] = { .len = ETH_ALEN },
+ [NL80211_ATTR_PREV_BSSID] = { .len = ETH_ALEN },
[NL80211_ATTR_KEY] = { .type = NLA_NESTED, },
[NL80211_ATTR_KEY_DATA] = { .type = NLA_BINARY,
OpenPOWER on IntegriCloud