diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-15 05:54:04 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:35 -0400 |
commit | 0a9542ee12fb57d408f19aac738e8abe8670be7a (patch) | |
tree | 9c2f2bcf2d69c33d78e19a5718733ca7f87678b7 /net/wireless | |
parent | 27df605ebe2c106c53957dfdaee5d948f01cfc97 (diff) |
nl80211: fix monitor flags
NLA_NESTED attributes cannot be empty, but we want to be able to
specify "no flags" (empty attribute) vs. "no change" (no attribute).
Therefore, remove the NLA_NESTED policy so it can work as an empty
attribute.
I guess I should have used a u32 for these flags instead, but we're
stuck with it now. Haven't noticed earlier because of a bug in iw...
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/nl80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 4d12e885170e..2b87aec231ea 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -84,7 +84,7 @@ static struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] __read_mostly = { | |||
84 | .len = NL80211_MAX_SUPP_RATES }, | 84 | .len = NL80211_MAX_SUPP_RATES }, |
85 | [NL80211_ATTR_STA_PLINK_ACTION] = { .type = NLA_U8 }, | 85 | [NL80211_ATTR_STA_PLINK_ACTION] = { .type = NLA_U8 }, |
86 | [NL80211_ATTR_STA_VLAN] = { .type = NLA_U32 }, | 86 | [NL80211_ATTR_STA_VLAN] = { .type = NLA_U32 }, |
87 | [NL80211_ATTR_MNTR_FLAGS] = { .type = NLA_NESTED }, | 87 | [NL80211_ATTR_MNTR_FLAGS] = { /* NLA_NESTED can't be empty */ }, |
88 | [NL80211_ATTR_MESH_ID] = { .type = NLA_BINARY, | 88 | [NL80211_ATTR_MESH_ID] = { .type = NLA_BINARY, |
89 | .len = IEEE80211_MAX_MESH_ID_LEN }, | 89 | .len = IEEE80211_MAX_MESH_ID_LEN }, |
90 | [NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_U32 }, | 90 | [NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_U32 }, |