On Friday 15 August 2008, Luis R. Rodriguez wrote:
> It is obviously good for userspace to know up front which
> interface modes a given piece of hardware might support (even
> if adding such an interface might fail later because of
> concurrency issues), so let's make cfg80211 aware of that.
> For good measure, disallow adding interfaces in all other
> modes so drivers don't forget to announce support for one mode
> when they add it.
>
> Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
> ---
>
> I needed to move on with iw so I figure I'd finish this off.
> I am not sure if where I put the stuff in rt2x00 is right. Review is
> appreciated.
>
> drivers/net/wireless/adm8211.c | 1 +
> drivers/net/wireless/at76_usb.c | 2 ++
> drivers/net/wireless/ath5k/base.c | 5 +++++
> drivers/net/wireless/ath9k/main.c | 5 +++++
> drivers/net/wireless/b43/main.c | 7 +++++++
> drivers/net/wireless/b43legacy/main.c | 5 +++++
> drivers/net/wireless/iwlwifi/iwl-core.c | 4 ++++
> drivers/net/wireless/iwlwifi/iwl3945-base.c | 5 +++++
> drivers/net/wireless/mac80211_hwsim.c | 3 +++
> drivers/net/wireless/p54/p54common.c | 3 +++
> drivers/net/wireless/rt2x00/rt2x00dev.c | 5 +++++
I've acked and forwarded to linux-wireless a similar patch for rt2x00 from
[PATCH 5/5] rt2x00: Need to set wiphy->interface_modes Stephen Blackheath
earlier today.
Ivo
> drivers/net/wireless/rtl8187_dev.c | 2 ++
> drivers/net/wireless/zd1211rw/zd_mac.c | 5 +++++
> include/linux/nl80211.h | 6 ++++++
> include/net/wireless.h | 3 +++
> net/mac80211/main.c | 7 +++++++
> net/wireless/core.c | 9 ++++++++-
> net/wireless/nl80211.c | 22 ++++++++++++++++++++--
> 18 files changed, 96 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
> index 3333d45..c6a55cd 100644
> --- a/drivers/net/wireless/adm8211.c
> +++ b/drivers/net/wireless/adm8211.c
> @@ -1884,6 +1884,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
> dev->extra_tx_headroom = sizeof(struct adm8211_tx_hdr);
> /* dev->flags = IEEE80211_HW_RX_INCLUDES_FCS in promisc mode */
> dev->flags = IEEE80211_HW_SIGNAL_UNSPEC;
> + dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
>
> dev->channel_change_time = 1000;
> dev->max_signal = 100; /* FIXME: find better value */
> diff --git a/drivers/net/wireless/at76_usb.c b/drivers/net/wireless/at76_usb.c
> index 29ebdd2..7533fb2 100644
> --- a/drivers/net/wireless/at76_usb.c
> +++ b/drivers/net/wireless/at76_usb.c
> @@ -2547,6 +2547,8 @@ static int at76_init_new_device(struct at76_priv *priv,
> priv->hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
> IEEE80211_HW_SIGNAL_UNSPEC;
>
> + priv->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
> +
> SET_IEEE80211_DEV(priv->hw, &interface->dev);
> SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
>
> diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
> index b362c48..21b353d 100644
> --- a/drivers/net/wireless/ath5k/base.c
> +++ b/drivers/net/wireless/ath5k/base.c
> @@ -486,6 +486,11 @@ ath5k_pci_probe(struct pci_dev *pdev,
> hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
> IEEE80211_HW_SIGNAL_DBM |
> IEEE80211_HW_NOISE_DBM;
> +
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_STATION) |
> + BIT(NL80211_IFTYPE_ADHOC);
> +
> hw->extra_tx_headroom = 2;
> hw->channel_change_time = 5000;
> sc = hw->priv;
> diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
> index 2888778..1985fa9 100644
> --- a/drivers/net/wireless/ath9k/main.c
> +++ b/drivers/net/wireless/ath9k/main.c
> @@ -1343,6 +1343,11 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> hw->flags = IEEE80211_HW_SIGNAL_DBM |
> IEEE80211_HW_NOISE_DBM;
>
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_AP) |
> + BIT(NL80211_IFTYPE_STATION) |
> + BIT(NL80211_IFTYPE_ADHOC);
> +
> SET_IEEE80211_DEV(hw, &pdev->dev);
> pci_set_drvdata(pdev, hw);
>
> diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
> index 3bf3a86..bb33586 100644
> --- a/drivers/net/wireless/b43/main.c
> +++ b/drivers/net/wireless/b43/main.c
> @@ -4649,6 +4649,13 @@ static int b43_wireless_init(struct ssb_device *dev)
> IEEE80211_HW_SIGNAL_DBM |
> IEEE80211_HW_NOISE_DBM;
>
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_AP) |
> + BIT(NL80211_IFTYPE_MESH_POINT) |
> + BIT(NL80211_IFTYPE_STATION) |
> + BIT(NL80211_IFTYPE_WDS) |
> + BIT(NL80211_IFTYPE_ADHOC);
> +
> hw->queues = b43_modparam_qos ? 4 : 1;
> SET_IEEE80211_DEV(hw, dev->dev);
> if (is_valid_ether_addr(sprom->et1mac))
> diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
> index 2541c81..b5a5882 100644
> --- a/drivers/net/wireless/b43legacy/main.c
> +++ b/drivers/net/wireless/b43legacy/main.c
> @@ -3705,6 +3705,11 @@ static int b43legacy_wireless_init(struct ssb_device *dev)
> hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
> IEEE80211_HW_SIGNAL_DBM |
> IEEE80211_HW_NOISE_DBM;
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_AP) |
> + BIT(NL80211_IFTYPE_STATION) |
> + BIT(NL80211_IFTYPE_WDS) |
> + BIT(NL80211_IFTYPE_ADHOC);
> hw->queues = 1; /* FIXME: hardware has more queues */
> SET_IEEE80211_DEV(hw, dev->dev);
> if (is_valid_ether_addr(sprom->et1mac))
> diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
> index f3dd622..92cbe03 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-core.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-core.c
> @@ -820,6 +820,10 @@ int iwl_setup_mac(struct iwl_priv *priv)
> /* Tell mac80211 our characteristics */
> hw->flags = IEEE80211_HW_SIGNAL_DBM |
> IEEE80211_HW_NOISE_DBM;
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_AP) |
> + BIT(NL80211_IFTYPE_STATION) |
> + BIT(NL80211_IFTYPE_ADHOC);
> /* Default value; 4 EDCA QOS priorities */
> hw->queues = 4;
> /* queues to support 11n aggregation */
> diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
> index 7095d8c..4725ead 100644
> --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
> +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
> @@ -7889,6 +7889,11 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
> hw->flags = IEEE80211_HW_SIGNAL_DBM |
> IEEE80211_HW_NOISE_DBM;
>
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_AP) |
> + BIT(NL80211_IFTYPE_STATION) |
> + BIT(NL80211_IFTYPE_ADHOC);
> +
> /* 4 EDCA QOS priorities */
> hw->queues = 4;
>
> diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
> index 248d31a..6791500 100644
> --- a/drivers/net/wireless/mac80211_hwsim.c
> +++ b/drivers/net/wireless/mac80211_hwsim.c
> @@ -447,6 +447,9 @@ static int __init init_mac80211_hwsim(void)
>
> hw->channel_change_time = 1;
> hw->queues = 1;
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_STATION) |
> + BIT(NL80211_IFTYPE_AP);
>
> memcpy(data->channels, hwsim_channels, sizeof(hwsim_channels));
> memcpy(data->rates, hwsim_rates, sizeof(hwsim_rates));
> diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
> index 83cd85e..42302e4 100644
> --- a/drivers/net/wireless/p54/p54common.c
> +++ b/drivers/net/wireless/p54/p54common.c
> @@ -1010,6 +1010,9 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
> dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | /* not sure */
> IEEE80211_HW_RX_INCLUDES_FCS |
> IEEE80211_HW_SIGNAL_UNSPEC;
> +
> + dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
> +
> dev->channel_change_time = 1000; /* TODO: find actual value */
> dev->max_signal = 127;
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
> index f42283a..56330ff 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
> @@ -868,6 +868,11 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
> &rt2x00dev->bands[IEEE80211_BAND_5GHZ];
> }
>
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_AP) |
> + BIT(NL80211_IFTYPE_STATION) |
> + BIT(NL80211_IFTYPE_ADHOC);
> +
> return 0;
>
> exit_free_channels:
> diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
> index 9e2f391..13e50d2 100644
> --- a/drivers/net/wireless/rtl8187_dev.c
> +++ b/drivers/net/wireless/rtl8187_dev.c
> @@ -1183,6 +1183,8 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
> dev->max_signal = 65;
> }
>
> + dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
> +
> if ((id->driver_info == DEVICE_RTL8187) && priv->is_rtl8187b)
> printk(KERN_INFO "rtl8187: inconsistency between id with OEM"
> " info!\n");
> diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
> index 63ee066..3005dd1 100644
> --- a/drivers/net/wireless/zd1211rw/zd_mac.c
> +++ b/drivers/net/wireless/zd1211rw/zd_mac.c
> @@ -969,6 +969,11 @@ struct ieee80211_hw *zd_mac_alloc_hw(struct usb_interface *intf)
> hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
> IEEE80211_HW_SIGNAL_DB;
>
> + hw->wiphy->interface_modes =
> + BIT(NL80211_IFTYPE_MESH_POINT) |
> + BIT(NL80211_IFTYPE_STATION) |
> + BIT(NL80211_IFTYPE_ADHOC);
> +
> hw->max_signal = 100;
> hw->queues = 1;
> hw->extra_tx_headroom = sizeof(struct zd_ctrlset);
> diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
> index 825fcc6..6bd1971 100644
> --- a/include/linux/nl80211.h
> +++ b/include/linux/nl80211.h
> @@ -214,6 +214,10 @@ enum nl80211_commands {
> * @NL80211_ATTR_REG_RULES: a nested array of regulatory domain regulatory
> * rules.
> *
> + * @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
> */
> @@ -260,6 +264,8 @@ enum nl80211_attrs {
> NL80211_ATTR_REG_ALPHA2,
> NL80211_ATTR_REG_RULES,
>
> + 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 24afa80..f6b31d0 100644
> --- a/include/net/wireless.h
> +++ b/include/net/wireless.h
> @@ -188,6 +188,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
> diff --git a/net/mac80211/main.c b/net/mac80211/main.c
> index aa5a191..3fed07c 100644
> --- a/net/mac80211/main.c
> +++ b/net/mac80211/main.c
> @@ -1639,6 +1639,13 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
> }
> }
>
> + /* if low-level driver supports AP, we also support VLAN */
> + if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_AP))
> + local->hw.wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP_VLAN);
> +
> + /* mac80211 always supports monitor */
> + local->hw.wiphy->interface_modes |= BIT(NL80211_IFTYPE_MONITOR);
> +
> result = wiphy_register(local->hw.wiphy);
> if (result < 0)
> return result;
> diff --git a/net/wireless/core.c b/net/wireless/core.c
> index 0013307..b24e459 100644
> --- a/net/wireless/core.c
> +++ b/net/wireless/core.c
> @@ -1,7 +1,7 @@
> /*
> * This is the linux wireless configuration interface.
> *
> - * Copyright 2006, 2007 Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> + * Copyright 2006-2008 Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> */
>
> #include <linux/if.h>
> @@ -285,6 +285,13 @@ int wiphy_register(struct wiphy *wiphy)
> struct ieee80211_supported_band *sband;
> bool have_band = false;
> int i;
> + u16 ifmodes = wiphy->interface_modes;
> +
> + /* sanity check ifmodes */
> + WARN_ON(!ifmodes);
> + ifmodes &= ((1 << __NL80211_IFTYPE_AFTER_LAST) - 1) & ~1;
> + if (WARN_ON(ifmodes != wiphy->interface_modes))
> + wiphy->interface_modes = ifmodes;
>
> /* sanity check supported bands/channels */
> for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
> diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
> index 0d29364..c592f35 100644
> --- a/net/wireless/nl80211.c
> +++ b/net/wireless/nl80211.c
> @@ -110,10 +110,12 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
> struct nlattr *nl_bands, *nl_band;
> struct nlattr *nl_freqs, *nl_freq;
> struct nlattr *nl_rates, *nl_rate;
> + struct nlattr *nl_modes;
> enum ieee80211_band band;
> struct ieee80211_channel *chan;
> struct ieee80211_rate *rate;
> int i;
> + u16 ifmodes = dev->wiphy.interface_modes;
>
> hdr = nl80211hdr_put(msg, pid, seq, flags, NL80211_CMD_NEW_WIPHY);
> if (!hdr)
> @@ -122,6 +124,20 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
> NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, dev->idx);
> NLA_PUT_STRING(msg, NL80211_ATTR_WIPHY_NAME, wiphy_name(&dev->wiphy));
>
> + nl_modes = nla_nest_start(msg, NL80211_ATTR_SUPPORTED_IFTYPES);
> + if (!nl_modes)
> + goto nla_put_failure;
> +
> + i = 0;
> + while (ifmodes) {
> + if (ifmodes & 1)
> + NLA_PUT_FLAG(msg, i);
> + ifmodes >>= 1;
> + i++;
> + }
> +
> + nla_nest_end(msg, nl_modes);
> +
> nl_bands = nla_nest_start(msg, NL80211_ATTR_WIPHY_BANDS);
> if (!nl_bands)
> goto nla_put_failure;
> @@ -412,7 +428,8 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info)
> ifindex = dev->ifindex;
> dev_put(dev);
>
> - if (!drv->ops->change_virtual_intf) {
> + if (!drv->ops->change_virtual_intf ||
> + !(drv->wiphy.interface_modes & (1 << type))) {
> err = -EOPNOTSUPP;
> goto unlock;
> }
> @@ -459,7 +476,8 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info)
> if (IS_ERR(drv))
> return PTR_ERR(drv);
>
> - if (!drv->ops->add_virtual_intf) {
> + if (!drv->ops->add_virtual_intf ||
> + !(drv->wiphy.interface_modes & (1 << type))) {
> err = -EOPNOTSUPP;
> goto unlock;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
