diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-02 15:44:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-02 15:44:03 -0500 |
| commit | d7a4858c0fde8383f7aa494eda0fba6bef3f2fec (patch) | |
| tree | 2cbf6915ea069ada4e3e1bca0b91b12e06500681 /net/wireless/nl80211.c | |
| parent | ba5736a5e9ac20c378ae4179e8a0ed3cc4b44351 (diff) | |
| parent | 9995ffe5f5fdddcc73e4465cc3f8b38714df8108 (diff) | |
| download | op-kernel-dev-d7a4858c0fde8383f7aa494eda0fba6bef3f2fec.zip op-kernel-dev-d7a4858c0fde8383f7aa494eda0fba6bef3f2fec.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/libertas/cfg.c
Diffstat (limited to 'net/wireless/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 0ee512b..8a9b4d8 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, |
