Commit e72615f6 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents a0dfb263 c6b6eedc

drivers/net/wireless/ath/ath5k/eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ ath5k_eeprom_read_target_rate_pwr_info(struct ath5k_hw *ah, unsigned int mode) 
	case AR5K_EEPROM_MODE_11A:

		offset += AR5K_EEPROM_TARGET_PWR_OFF_11A(ee->ee_version);

		rate_pcal_info = ee->ee_rate_tpwr_a;

		ee->ee_rate_target_pwr_num[mode] = AR5K_EEPROM_N_5GHZ_CHAN;

		ee->ee_rate_target_pwr_num[mode] = AR5K_EEPROM_N_5GHZ_RATE_CHAN;

		break;

	case AR5K_EEPROM_MODE_11B:

		offset += AR5K_EEPROM_TARGET_PWR_OFF_11B(ee->ee_version);

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

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ 
#define AR5K_EEPROM_EEP_DELTA		10

#define AR5K_EEPROM_N_MODES		3

#define AR5K_EEPROM_N_5GHZ_CHAN		10

#define AR5K_EEPROM_N_5GHZ_RATE_CHAN	8

#define AR5K_EEPROM_N_2GHZ_CHAN		3

#define AR5K_EEPROM_N_2GHZ_CHAN_2413	4

#define	AR5K_EEPROM_N_2GHZ_CHAN_MAX	4

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

+3 −0
Original line number Diff line number Diff line
@@ -1233,6 +1233,9 @@ uint brcms_reset(struct brcms_info *wl) 
	/* dpc will not be rescheduled */

	wl->resched = false;



	/* inform publicly that interface is down */

	wl->pub->up = false;



	return 0;

}

drivers/net/wireless/ipw2x00/ipw2100.c

+2 −1
Original line number Diff line number Diff line
@@ -2042,7 +2042,8 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status) 
		return;

	}

	len = ETH_ALEN;

	ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID, &bssid, &len);

	ret = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ASSN_AP_BSSID, bssid,

				  &len);

	if (ret) {

		IPW_DEBUG_INFO("failed querying ordinals at line %d\n",

			       __LINE__);

drivers/net/wireless/iwlwifi/dvm/debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file, 
	const struct fw_img *img;

	size_t bufsz;



	if (!iwl_is_ready_rf(priv))

		return -EAGAIN;



	/* default is to dump the entire data segment */

	if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) {

		priv->dbgfs_sram_offset = 0x800000;