Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 605a0bd6 authored Jul 15, 2008 by Johannes Berg Committed by John W. Linville Jul 29, 2008

mac80211: remove IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE flag



I forgot this in the previous patch that made it unused.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 281c7413

drivers/net/wireless/b43/main.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -4645,8 +4645,7 @@ static int b43_wireless_init(struct ssb_device *dev)
		}

		/* fill hw info */
		hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE \|
		IEEE80211_HW_RX_INCLUDES_FCS \|
		hw->flags = IEEE80211_HW_RX_INCLUDES_FCS \|
		IEEE80211_HW_SIGNAL_DBM \|
		IEEE80211_HW_NOISE_DBM;

drivers/net/wireless/b43legacy/main.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -3702,8 +3702,7 @@ static int b43legacy_wireless_init(struct ssb_device *dev)
		}

		/* fill hw info */
		hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE \|
		IEEE80211_HW_RX_INCLUDES_FCS \|
		hw->flags = IEEE80211_HW_RX_INCLUDES_FCS \|
		IEEE80211_HW_SIGNAL_DBM \|
		IEEE80211_HW_NOISE_DBM;
		hw->queues = 1; /* FIXME: hardware has more queues */

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -818,8 +818,7 @@ int iwl_setup_mac(struct iwl_priv *priv)
		hw->rate_control_algorithm = "iwl-4965-rs";

		/* Tell mac80211 our characteristics */
		hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE \|
		IEEE80211_HW_SIGNAL_DBM \|
		hw->flags = IEEE80211_HW_SIGNAL_DBM \|
		IEEE80211_HW_NOISE_DBM;
		/* Default value; 4 EDCA QOS priorities */
		hw->queues = 4;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -7899,8 +7899,7 @@ static int iwl3945_pci_probe(struct pci_dev pdev, const struct pci_device_id e
		priv->ibss_beacon = NULL;

		/* Tell mac80211 our characteristics */
		hw->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE \|
		IEEE80211_HW_SIGNAL_DBM \|
		hw->flags = IEEE80211_HW_SIGNAL_DBM \|
		IEEE80211_HW_NOISE_DBM;

		/* 4 EDCA QOS priorities */

drivers/net/wireless/rt2x00/rt2500usb.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1650,7 +1650,6 @@ static void rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
		* Initialize all hw fields.
		*/
		rt2x00dev->hw->flags =
		IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE \|
		IEEE80211_HW_RX_INCLUDES_FCS \|
		IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING \|
		IEEE80211_HW_SIGNAL_DBM;