Commit f59ac048 authored Aug 29, 2008 by Luis R. Rodriguez Committed by John W. Linville Sep 05, 2008

cfg80211: keep track of supported interface modes



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@sipsolutions.net>
Signed-off-by: Stephen Blackheath <tramp.enshrine.stephen@blacksapphire.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent c6e387a2

drivers/net/wireless/adm8211.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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 */

drivers/net/wireless/ath5k/base.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -485,6 +485,12 @@ 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) \|
		BIT(NL80211_IFTYPE_MESH_POINT);

		hw->extra_tx_headroom = 2;
		hw->channel_change_time = 5000;
		sc = hw->priv;

drivers/net/wireless/ath9k/main.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1482,6 +1482,11 @@ static int ath_pci_probe(struct pci_dev pdev, const struct pci_device_id id)
		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);

drivers/net/wireless/b43/main.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -4569,6 +4569,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))

drivers/net/wireless/b43legacy/main.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -3704,6 +3704,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))