Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 (fc943b12) · Commits · 方亚芬 / linux

Documentation/feature-removal-schedule.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -333,3 +333,13 @@ Why: This option was introduced just to allow older lm-sensors userspace
		to keep working over the upgrade to 2.6.26. At the scheduled time of
		removal fixed lm-sensors (2.x or 3.x) should be readily available.
		Who: Rene Herman <rene.herman@gmail.com>

		---------------------------

		What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS
		(in net/core/net-sysfs.c)
		When: After the only user (hal) has seen a release with the patches
		for enough time, probably some time in 2010.
		Why: Over 1K .text/.data size reduction, data is available in other
		ways (ioctls)
		Who: Johannes Berg <johannes@sipsolutions.net>

drivers/net/wireless/ath5k/base.c

+12 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,6 @@ static struct ieee80211_ops ath5k_hw_ops = {
		.get_tx_stats = ath5k_get_tx_stats,
		.get_tsf = ath5k_get_tsf,
		.reset_tsf = ath5k_reset_tsf,
		.beacon_update = ath5k_beacon_update,
		};

		/*
		@@ -2785,6 +2784,18 @@ ath5k_config_interface(struct ieee80211_hw hw, struct ieee80211_vif vif,
		* a clean way of letting us retrieve this yet. */
		ath5k_hw_set_associd(ah, ah->ah_bssid, 0);
		}

		if (conf->changed & IEEE80211_IFCC_BEACON &&
		vif->type == IEEE80211_IF_TYPE_IBSS) {
		struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);
		if (!beacon) {
		ret = -ENOMEM;
		goto unlock;
		}
		/* call old handler for now */
		ath5k_beacon_update(hw, beacon);
		}

		mutex_unlock(&sc->lock);

		return ath5k_reset(hw);

drivers/net/wireless/b43/main.c

+20 −28

Original line number	Diff line number	Diff line
		@@ -1675,14 +1675,24 @@ static void b43_beacon_update_trigger_work(struct work_struct *work)

		/* Asynchronously update the packet templates in template RAM.
		* Locking: Requires wl->irq_lock to be locked. */
		static void b43_update_templates(struct b43_wl wl, struct sk_buff beacon)
		static void b43_update_templates(struct b43_wl *wl)
		{
		struct sk_buff *beacon;

		/* This is the top half of the ansynchronous beacon update.
		* The bottom half is the beacon IRQ.
		* Beacon update must be asynchronous to avoid sending an
		* invalid beacon. This can happen for example, if the firmware
		* transmits a beacon while we are updating it. */

		/* We could modify the existing beacon and set the aid bit in
		* the TIM field, but that would probably require resizing and
		* moving of data within the beacon template.
		* Simply request a new beacon and let mac80211 do the hard work. */
		beacon = ieee80211_beacon_get(wl->hw, wl->vif);
		if (unlikely(!beacon))
		return;

		if (wl->current_beacon)
		dev_kfree_skb_any(wl->current_beacon);
		wl->current_beacon = beacon;
		@@ -3645,10 +3655,14 @@ static int b43_op_config_interface(struct ieee80211_hw *hw,
		if (b43_status(dev) >= B43_STAT_INITIALIZED) {
		if (b43_is_mode(wl, IEEE80211_IF_TYPE_AP) \|\|
		b43_is_mode(wl, IEEE80211_IF_TYPE_MESH_POINT)) {
		B43_WARN_ON(conf->type != wl->if_type);
		B43_WARN_ON(vif->type != wl->if_type);
		if (conf->changed & IEEE80211_IFCC_SSID)
		b43_set_ssid(dev, conf->ssid, conf->ssid_len);
		if (conf->beacon)
		b43_update_templates(wl, conf->beacon);
		if (conf->changed & IEEE80211_IFCC_BEACON)
		b43_update_templates(wl);
		} else if (b43_is_mode(wl, IEEE80211_IF_TYPE_IBSS)) {
		if (conf->changed & IEEE80211_IFCC_BEACON)
		b43_update_templates(wl);
		}
		b43_write_mac_bssid_templates(dev);
		}
		@@ -4334,33 +4348,12 @@ static int b43_op_set_retry_limit(struct ieee80211_hw *hw,
		}

		static int b43_op_beacon_set_tim(struct ieee80211_hw *hw, int aid, int set)
		{
		struct b43_wl *wl = hw_to_b43_wl(hw);
		struct sk_buff *beacon;
		unsigned long flags;

		/* We could modify the existing beacon and set the aid bit in
		* the TIM field, but that would probably require resizing and
		* moving of data within the beacon template.
		* Simply request a new beacon and let mac80211 do the hard work. */
		beacon = ieee80211_beacon_get(hw, wl->vif);
		if (unlikely(!beacon))
		return -ENOMEM;
		spin_lock_irqsave(&wl->irq_lock, flags);
		b43_update_templates(wl, beacon);
		spin_unlock_irqrestore(&wl->irq_lock, flags);

		return 0;
		}

		static int b43_op_ibss_beacon_update(struct ieee80211_hw *hw,
		struct sk_buff *beacon)
		{
		struct b43_wl *wl = hw_to_b43_wl(hw);
		unsigned long flags;

		spin_lock_irqsave(&wl->irq_lock, flags);
		b43_update_templates(wl, beacon);
		b43_update_templates(wl);
		spin_unlock_irqrestore(&wl->irq_lock, flags);

		return 0;
		@@ -4391,7 +4384,6 @@ static const struct ieee80211_ops b43_hw_ops = {
		.stop = b43_op_stop,
		.set_retry_limit = b43_op_set_retry_limit,
		.set_tim = b43_op_beacon_set_tim,
		.beacon_update = b43_op_ibss_beacon_update,
		.sta_notify = b43_op_sta_notify,
		};

drivers/net/wireless/b43/xmit.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -317,7 +317,8 @@ int b43_generate_txhdr(struct b43_wldev *dev,
		/* MAC control */
		if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
		mac_ctl \|= B43_TXH_MAC_ACK;
		if (!ieee80211_is_pspoll(fctl))
		/* use hardware sequence counter as the non-TID counter */
		if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
		mac_ctl \|= B43_TXH_MAC_HWSEQ;
		if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
		mac_ctl \|= B43_TXH_MAC_STMSDU;

drivers/net/wireless/b43legacy/main.c

+17 −28

Original line number	Diff line number	Diff line
		@@ -1138,14 +1138,22 @@ static void b43legacy_write_probe_resp_template(struct b43legacy_wldev *dev,

		/* Asynchronously update the packet templates in template RAM.
		* Locking: Requires wl->irq_lock to be locked. */
		static void b43legacy_update_templates(struct b43legacy_wl *wl,
		struct sk_buff *beacon)
		static void b43legacy_update_templates(struct b43legacy_wl *wl)
		{
		struct sk_buff *beacon;
		/* This is the top half of the ansynchronous beacon update. The bottom
		* half is the beacon IRQ. Beacon update must be asynchronous to avoid
		* sending an invalid beacon. This can happen for example, if the
		* firmware transmits a beacon while we are updating it. */

		/* We could modify the existing beacon and set the aid bit in the TIM
		* field, but that would probably require resizing and moving of data
		* within the beacon template. Simply request a new beacon and let
		* mac80211 do the hard work. */
		beacon = ieee80211_beacon_get(wl->hw, wl->vif);
		if (unlikely(!beacon))
		return;

		if (wl->current_beacon)
		dev_kfree_skb_any(wl->current_beacon);
		wl->current_beacon = beacon;
		@@ -2727,10 +2735,13 @@ static int b43legacy_op_config_interface(struct ieee80211_hw *hw,
		memset(wl->bssid, 0, ETH_ALEN);
		if (b43legacy_status(dev) >= B43legacy_STAT_INITIALIZED) {
		if (b43legacy_is_mode(wl, IEEE80211_IF_TYPE_AP)) {
		B43legacy_WARN_ON(conf->type != IEEE80211_IF_TYPE_AP);
		B43legacy_WARN_ON(vif->type != IEEE80211_IF_TYPE_AP);
		b43legacy_set_ssid(dev, conf->ssid, conf->ssid_len);
		if (conf->beacon)
		b43legacy_update_templates(wl, conf->beacon);
		if (conf->changed & IEEE80211_IFCC_BEACON)
		b43legacy_update_templates(wl);
		} else if (b43legacy_is_mode(wl, IEEE80211_IF_TYPE_IBSS)) {
		if (conf->changed & IEEE80211_IFCC_BEACON)
		b43legacy_update_templates(wl);
		}
		b43legacy_write_mac_bssid_templates(dev);
		}
		@@ -3394,33 +3405,12 @@ static int b43legacy_op_set_retry_limit(struct ieee80211_hw *hw,

		static int b43legacy_op_beacon_set_tim(struct ieee80211_hw *hw,
		int aid, int set)
		{
		struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
		struct sk_buff *beacon;
		unsigned long flags;

		/* We could modify the existing beacon and set the aid bit in the TIM
		* field, but that would probably require resizing and moving of data
		* within the beacon template. Simply request a new beacon and let
		* mac80211 do the hard work. */
		beacon = ieee80211_beacon_get(hw, wl->vif);
		if (unlikely(!beacon))
		return -ENOMEM;
		spin_lock_irqsave(&wl->irq_lock, flags);
		b43legacy_update_templates(wl, beacon);
		spin_unlock_irqrestore(&wl->irq_lock, flags);

		return 0;
		}

		static int b43legacy_op_ibss_beacon_update(struct ieee80211_hw *hw,
		struct sk_buff *beacon)
		{
		struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
		unsigned long flags;

		spin_lock_irqsave(&wl->irq_lock, flags);
		b43legacy_update_templates(wl, beacon);
		b43legacy_update_templates(wl);
		spin_unlock_irqrestore(&wl->irq_lock, flags);

		return 0;
		@@ -3440,7 +3430,6 @@ static const struct ieee80211_ops b43legacy_hw_ops = {
		.stop = b43legacy_op_stop,
		.set_retry_limit = b43legacy_op_set_retry_limit,
		.set_tim = b43legacy_op_beacon_set_tim,
		.beacon_update = b43legacy_op_ibss_beacon_update,
		};

		/* Hard-reset the chip. Do not call this directly.