diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-09 03:10:53 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-09 03:10:53 +0400 |
| commit | 9bff9dbd00e5907f5c36e72bae8aee8a46440e11 (patch) | |
| tree | 4a5666939b61a13e7cde01b29baf4cb609fb8c90 /include | |
| parent | e2a6b85247aacc52d6ba0d9b37a99b8d1a3e0d83 (diff) | |
| parent | d10c4ec8b4bc02f3874c7ef3c3539e4e7e123969 (diff) | |
| download | linux-9bff9dbd00e5907f5c36e72bae8aee8a46440e11.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nl80211.h | 6 | ||||
| -rw-r--r-- | include/net/wireless.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 0c1147de3ec7..5e51f4e7600b 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h @@ -210,6 +210,10 @@ enum nl80211_commands { * @NL80211_ATTR_HT_CAPABILITY: HT Capability information element (from * association request when used with NL80211_CMD_NEW_STATION) * + * @NL80211_ATTR_SUPPORTED_IFTYPES: nested attribute containing all + * supported interface types, each a flag attribute with the number + * of the interface mode. + * * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */ @@ -259,6 +263,8 @@ enum nl80211_attrs { NL80211_ATTR_HT_CAPABILITY, + NL80211_ATTR_SUPPORTED_IFTYPES, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, diff --git a/include/net/wireless.h b/include/net/wireless.h index 9324f8dd183e..1dc8ec3daa2f 100644 --- a/include/net/wireless.h +++ b/include/net/wireless.h @@ -185,6 +185,9 @@ struct wiphy { /* permanent MAC address */ u8 perm_addr[ETH_ALEN]; + /* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */ + u16 interface_modes; + /* If multiple wiphys are registered and you're handed e.g. * a regular netdev with assigned ieee80211_ptr, you won't * know whether it points to a wiphy your driver has registered |