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

Commit b7f1d43a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

parents 6c988853 ad43f8bf

MAINTAINERS

+5 −9
Original line number Diff line number Diff line
@@ -2653,25 +2653,21 @@ F: drivers/net/ixgbe/ 


INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT

M:	Zhu Yi <yi.zhu@intel.com>

M:	James Ketrenos <jketreno@linux.intel.com>

M:	Reinette Chatre <reinette.chatre@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

L:	ipw2100-devel@lists.sourceforge.net

W:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel

W:	http://ipw2100.sourceforge.net

S:	Supported

S:	Odd Fixes

F:	Documentation/networking/README.ipw2100

F:	drivers/net/wireless/ipw2x00/ipw2100.*



INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT

M:	Zhu Yi <yi.zhu@intel.com>

M:	James Ketrenos <jketreno@linux.intel.com>

M:	Reinette Chatre <reinette.chatre@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

L:	ipw2100-devel@lists.sourceforge.net

W:	http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel

W:	http://ipw2200.sourceforge.net

S:	Supported

S:	Odd Fixes

F:	Documentation/networking/README.ipw2200

F:	drivers/net/wireless/ipw2x00/ipw2200.*
@@ -2688,8 +2684,8 @@ F: include/linux/wimax/i2400m.h 
INTEL WIRELESS WIFI LINK (iwlwifi)

M:	Zhu Yi <yi.zhu@intel.com>

M:	Reinette Chatre <reinette.chatre@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

L:	ipw3945-devel@lists.sourceforge.net

W:	http://intellinuxwireless.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git

S:	Supported

drivers/net/wireless/ath/ar9170/ar9170.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ struct ar9170 { 
	/* beaconing */

	struct sk_buff *beacon;

	struct work_struct beacon_work;

	bool enable_beacon;



	/* cryptographic engine */

	u64 usedkeys;

drivers/net/wireless/ath/ar9170/mac.c

+13 −11
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ int ar9170_set_beacon_timers(struct ar9170 *ar) 
	if (ar->vif) {

		v |= ar->vif->bss_conf.beacon_int;



		if (ar->enable_beacon) {

			switch (ar->vif->type) {

			case NL80211_IFTYPE_MESH_POINT:

			case NL80211_IFTYPE_ADHOC:
@@ -390,17 +391,18 @@ int ar9170_set_beacon_timers(struct ar9170 *ar) 
				break;

			case NL80211_IFTYPE_AP:

				v |= BIT(24);

			pretbtt = (ar->vif->bss_conf.beacon_int - 6) << 16;

				pretbtt = (ar->vif->bss_conf.beacon_int - 6) <<

					  16;

				break;

			default:

			break;

			}

		}



		v |= ar->vif->bss_conf.dtim_period << 16;

	}



	ar9170_regwrite_begin(ar);



	ar9170_regwrite(AR9170_MAC_REG_PRETBTT, pretbtt);

	ar9170_regwrite(AR9170_MAC_REG_BCN_PERIOD, v);

	ar9170_regwrite_finish();

drivers/net/wireless/ath/ar9170/main.c

+7 −13
Original line number Diff line number Diff line
@@ -2031,12 +2031,6 @@ static int ar9170_op_config(struct ieee80211_hw *hw, u32 changed) 
			goto out;

	}



	if (changed & BSS_CHANGED_BEACON_INT) {

		err = ar9170_set_beacon_timers(ar);

		if (err)

			goto out;

	}



	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {



		/* adjust slot time for 5 GHz */
@@ -2148,11 +2142,17 @@ static void ar9170_op_bss_info_changed(struct ieee80211_hw *hw, 
			goto out;

	}



	if (changed & (BSS_CHANGED_BEACON | BSS_CHANGED_BEACON_ENABLED)) {

	if (changed & BSS_CHANGED_BEACON_ENABLED)

		ar->enable_beacon = bss_conf->enable_beacon;



	if (changed & BSS_CHANGED_BEACON) {

		err = ar9170_update_beacon(ar);

		if (err)

			goto out;

	}



	if (changed & (BSS_CHANGED_BEACON_ENABLED | BSS_CHANGED_BEACON |

		       BSS_CHANGED_BEACON_INT)) {

		err = ar9170_set_beacon_timers(ar);

		if (err)

			goto out;
@@ -2165,12 +2165,6 @@ static void ar9170_op_bss_info_changed(struct ieee80211_hw *hw, 
#endif /* CONFIG_AR9170_LEDS */

	}



	if (changed & BSS_CHANGED_BEACON_INT) {

		err = ar9170_set_beacon_timers(ar);

		if (err)

			goto out;

	}



	if (changed & BSS_CHANGED_HT) {

		/* TODO */

		err = 0;

drivers/net/wireless/ath/ath5k/ath5k.h

+3 −1
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ struct ath5k_srev_name { 
#define AR5K_SREV_AR5311B	0x30 /* Spirit */

#define AR5K_SREV_AR5211	0x40 /* Oahu */

#define AR5K_SREV_AR5212	0x50 /* Venice */

#define AR5K_SREV_AR5212_V4	0x54 /* ??? */

#define AR5K_SREV_AR5213	0x55 /* ??? */

#define AR5K_SREV_AR5213A	0x59 /* Hainan */

#define AR5K_SREV_AR2413	0x78 /* Griffin lite */
@@ -1037,6 +1038,7 @@ struct ath5k_hw { 
	bool			ah_turbo;

	bool			ah_calibration;

	bool			ah_single_chip;

	bool			ah_aes_support;

	bool			ah_combined_mic;



	enum ath5k_version	ah_version;
@@ -1158,7 +1160,7 @@ struct ath5k_hw { 
 */



/* Attach/Detach Functions */

extern struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version);

extern struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc);

extern void ath5k_hw_detach(struct ath5k_hw *ah);



/* LED functions */