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

Commit a8679be2 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 22f6dacd 9dfd6ba3

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -500,5 +500,6 @@ source "drivers/net/wireless/b43legacy/Kconfig" 
source "drivers/net/wireless/zd1211rw/Kconfig"

source "drivers/net/wireless/rt2x00/Kconfig"

source "drivers/net/wireless/orinoco/Kconfig"

source "drivers/net/wireless/wl12xx/Kconfig"



endmenu

drivers/net/wireless/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -58,3 +58,5 @@ obj-$(CONFIG_P54_COMMON) += p54/ 
obj-$(CONFIG_ATH_COMMON)	+= ath/



obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o



obj-$(CONFIG_WL12XX)	+= wl12xx/

drivers/net/wireless/adm8211.c

+8 −6
Original line number Diff line number Diff line
@@ -1311,18 +1311,20 @@ static int adm8211_config(struct ieee80211_hw *dev, u32 changed) 
	return 0;

}



static int adm8211_config_interface(struct ieee80211_hw *dev,

static void adm8211_bss_info_changed(struct ieee80211_hw *dev,

				     struct ieee80211_vif *vif,

				    struct ieee80211_if_conf *conf)

				     struct ieee80211_bss_conf *conf,

				     u32 changes)

{

	struct adm8211_priv *priv = dev->priv;



	if (!(changes & BSS_CHANGED_BSSID))

		return;



	if (memcmp(conf->bssid, priv->bssid, ETH_ALEN)) {

		adm8211_set_bssid(dev, conf->bssid);

		memcpy(priv->bssid, conf->bssid, ETH_ALEN);

	}



	return 0;

}



static void adm8211_configure_filter(struct ieee80211_hw *dev,
@@ -1753,7 +1755,7 @@ static const struct ieee80211_ops adm8211_ops = { 
	.add_interface		= adm8211_add_interface,

	.remove_interface	= adm8211_remove_interface,

	.config			= adm8211_config,

	.config_interface	= adm8211_config_interface,

	.bss_info_changed	= adm8211_bss_info_changed,

	.configure_filter	= adm8211_configure_filter,

	.get_stats		= adm8211_get_stats,

	.get_tx_stats		= adm8211_get_tx_stats,

drivers/net/wireless/at76c50x-usb.c

+9 −6
Original line number Diff line number Diff line
@@ -1965,13 +1965,18 @@ static int at76_config(struct ieee80211_hw *hw, u32 changed) 
	return 0;

}



static int at76_config_interface(struct ieee80211_hw *hw,

static void at76_bss_info_changed(struct ieee80211_hw *hw,

				  struct ieee80211_vif *vif,

				 struct ieee80211_if_conf *conf)

				  struct ieee80211_bss_conf *conf,

				  u32 changed)

{

	struct at76_priv *priv = hw->priv;



	at76_dbg(DBG_MAC80211, "%s():", __func__);



	if (!(changed & BSS_CHANGED_BSSID))

		return;



	at76_dbg_dump(DBG_MAC80211, conf->bssid, ETH_ALEN, "bssid:");



	mutex_lock(&priv->mtx);
@@ -1983,8 +1988,6 @@ static int at76_config_interface(struct ieee80211_hw *hw, 
		at76_join(priv);



	mutex_unlock(&priv->mtx);



	return 0;

}



/* must be atomic */
@@ -2076,7 +2079,7 @@ static const struct ieee80211_ops at76_ops = { 
	.add_interface = at76_add_interface,

	.remove_interface = at76_remove_interface,

	.config = at76_config,

	.config_interface = at76_config_interface,

	.bss_info_changed = at76_bss_info_changed,

	.configure_filter = at76_configure_filter,

	.start = at76_mac80211_start,

	.stop = at76_mac80211_stop,

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

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ enum ar9170_cmd { 
#define AR9170_MAC_REG_AC1_AC0_TXOP		(AR9170_MAC_REG_BASE + 0xB44)

#define AR9170_MAC_REG_AC3_AC2_TXOP		(AR9170_MAC_REG_BASE + 0xB48)



#define AR9170_MAC_REG_AMPDU_SET		(AR9170_MAC_REG_BASE + 0xba0)



#define AR9170_MAC_REG_ACK_TABLE		(AR9170_MAC_REG_BASE + 0xC00)

#define AR9170_MAC_REG_AMPDU_RX_THRESH		(AR9170_MAC_REG_BASE + 0xC50)