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

Commit 98d5fac2 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-next into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/dvm/tx.c
	drivers/net/wireless/ti/wlcore/sdio.c
	drivers/net/wireless/ti/wlcore/spi.c
parents 4153577a 9e97d14b

arch/arm/mach-omap2/board-omap3evm.c

+5 −5
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static struct omap2_hsmmc_info mmc[] = { 
		.gpio_wp	= 63,

		.deferred	= true,

	},

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	{

		.name		= "wl1271",

		.mmc		= 2,
@@ -450,7 +450,7 @@ static struct regulator_init_data omap3evm_vio = { 
	.consumer_supplies	= omap3evm_vio_supply,

};



#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA



#define OMAP3EVM_WLAN_PMENA_GPIO	(150)

#define OMAP3EVM_WLAN_IRQ_GPIO		(149)
@@ -563,7 +563,7 @@ static struct omap_board_mux omap35x_board_mux[] __initdata = { 
				OMAP_PIN_OFF_NONE),

	OMAP3_MUX(GPMC_WAIT2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP |

				OMAP_PIN_OFF_NONE),

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	/* WLAN IRQ - GPIO 149 */

	OMAP3_MUX(UART1_RTS, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
@@ -601,7 +601,7 @@ static struct omap_board_mux omap36x_board_mux[] __initdata = { 
	OMAP3_MUX(SYS_BOOT4, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),

	OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),

	OMAP3_MUX(SYS_BOOT6, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	/* WLAN IRQ - GPIO 149 */

	OMAP3_MUX(UART1_RTS, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
@@ -637,7 +637,7 @@ static struct gpio omap3_evm_ehci_gpios[] __initdata = { 


static void __init omap3_evm_wl12xx_init(void)

{

#ifdef CONFIG_WL12XX_PLATFORM_DATA

#ifdef CONFIG_WILINK_PLATFORM_DATA

	int ret;



	/* WL12xx WLAN Init */

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

+4 −0
Original line number Diff line number Diff line
@@ -1613,6 +1613,10 @@ ath5k_hw_update_noise_floor(struct ath5k_hw *ah) 
	ah->ah_cal_mask |= AR5K_CALIBRATION_NF;



	ee_mode = ath5k_eeprom_mode_from_channel(ah->ah_current_channel);

	if (WARN_ON(ee_mode < 0)) {

		ah->ah_cal_mask &= ~AR5K_CALIBRATION_NF;

		return;

	}



	/* completed NF calibration, test threshold */

	nf = ath5k_hw_read_measured_noise_floor(ah);

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

+2 −0
Original line number Diff line number Diff line
@@ -985,6 +985,8 @@ ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah, 
		return;



	ee_mode = ath5k_eeprom_mode_from_channel(channel);

	if (WARN_ON(ee_mode < 0))

		return;



	/* Adjust power delta for channel 14 */

	if (channel->center_freq == 2484)

drivers/net/wireless/ath/ath6kl/cfg80211.c

+73 −44
Original line number Diff line number Diff line
@@ -427,6 +427,30 @@ static bool ath6kl_is_tx_pending(struct ath6kl *ar) 
	return ar->tx_pending[ath6kl_wmi_get_control_ep(ar->wmi)] == 0;

}



static void ath6kl_cfg80211_sta_bmiss_enhance(struct ath6kl_vif *vif,

					      bool enable)

{

	int err;



	if (WARN_ON(!test_bit(WMI_READY, &vif->ar->flag)))

		return;



	if (vif->nw_type != INFRA_NETWORK)

		return;



	if (!test_bit(ATH6KL_FW_CAPABILITY_BMISS_ENHANCE,

		      vif->ar->fw_capabilities))

		return;



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s fw bmiss enhance\n",

		   enable ? "enable" : "disable");



	err = ath6kl_wmi_sta_bmiss_enhance_cmd(vif->ar->wmi,

					       vif->fw_vif_idx, enable);

	if (err)

		ath6kl_err("failed to %s enhanced bmiss detection: %d\n",

			   enable ? "enable" : "disable", err);

}



static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,

				   struct cfg80211_connect_params *sme)
@@ -616,13 +640,13 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, 
					vif->req_bssid, vif->ch_hint,

					ar->connect_ctrl_flags, nw_subtype);



	if (sme->bg_scan_period == 0) {

		/* disable background scan if period is 0 */

	if (sme->bg_scan_period == 0)

		sme->bg_scan_period = 0xffff;



	} else if (sme->bg_scan_period == -1) {

		/* configure default value if not specified */

	if (sme->bg_scan_period == -1)

		sme->bg_scan_period = DEFAULT_BG_SCAN_PERIOD;

	}



	ath6kl_wmi_scanparams_cmd(ar->wmi, vif->fw_vif_idx, 0, 0,

				  sme->bg_scan_period, 0, 0, 0, 3, 0, 0, 0);
@@ -767,7 +791,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel, 
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",

			   nw_type & ADHOC_CREATOR ? "creator" : "joiner");

		cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);

		cfg80211_put_bss(bss);

		cfg80211_put_bss(ar->wiphy, bss);

		return;

	}
@@ -778,7 +802,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel, 
					assoc_req_ie, assoc_req_len,

					assoc_resp_ie, assoc_resp_len,

					WLAN_STATUS_SUCCESS, GFP_KERNEL);

		cfg80211_put_bss(bss);

		cfg80211_put_bss(ar->wiphy, bss);

	} else if (vif->sme_state == SME_CONNECTED) {

		/* inform roam event to cfg80211 */

		cfg80211_roamed_bss(vif->ndev, bss, assoc_req_ie, assoc_req_len,
@@ -1454,10 +1478,10 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy, 
		return -EIO;



	if (pmgmt) {

		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: max perf\n", __func__);

		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: rec power\n", __func__);

		mode.pwr_mode = REC_POWER;

	} else {

		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: rec power\n", __func__);

		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: max perf\n", __func__);

		mode.pwr_mode = MAX_PERF_POWER;

	}
@@ -1509,7 +1533,7 @@ static int ath6kl_cfg80211_del_iface(struct wiphy *wiphy, 
	list_del(&vif->list);

	spin_unlock_bh(&ar->list_lock);



	ath6kl_cleanup_vif(vif, test_bit(WMI_READY, &ar->flag));

	ath6kl_cfg80211_vif_stop(vif, test_bit(WMI_READY, &ar->flag));



	ath6kl_cfg80211_vif_cleanup(vif);
@@ -1559,17 +1583,13 @@ static int ath6kl_cfg80211_change_iface(struct wiphy *wiphy, 
set_iface_type:

	switch (type) {

	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_P2P_CLIENT:

		vif->next_mode = INFRA_NETWORK;

		break;

	case NL80211_IFTYPE_ADHOC:

		vif->next_mode = ADHOC_NETWORK;

		break;

	case NL80211_IFTYPE_AP:

		vif->next_mode = AP_NETWORK;

		break;

	case NL80211_IFTYPE_P2P_CLIENT:

		vif->next_mode = INFRA_NETWORK;

		break;

	case NL80211_IFTYPE_P2P_GO:

		vif->next_mode = AP_NETWORK;

		break;
@@ -1778,14 +1798,14 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, 


	if (vif->target_stats.rx_byte) {

		sinfo->rx_bytes = vif->target_stats.rx_byte;

		sinfo->filled |= STATION_INFO_RX_BYTES;

		sinfo->filled |= STATION_INFO_RX_BYTES64;

		sinfo->rx_packets = vif->target_stats.rx_pkt;

		sinfo->filled |= STATION_INFO_RX_PACKETS;

	}



	if (vif->target_stats.tx_byte) {

		sinfo->tx_bytes = vif->target_stats.tx_byte;

		sinfo->filled |= STATION_INFO_TX_BYTES;

		sinfo->filled |= STATION_INFO_TX_BYTES64;

		sinfo->tx_packets = vif->target_stats.tx_pkt;

		sinfo->filled |= STATION_INFO_TX_PACKETS;

	}
@@ -2673,30 +2693,6 @@ static int ath6kl_set_ies(struct ath6kl_vif *vif, 
	return 0;

}



void ath6kl_cfg80211_sta_bmiss_enhance(struct ath6kl_vif *vif, bool enable)

{

	int err;



	if (WARN_ON(!test_bit(WMI_READY, &vif->ar->flag)))

		return;



	if (vif->nw_type != INFRA_NETWORK)

		return;



	if (!test_bit(ATH6KL_FW_CAPABILITY_BMISS_ENHANCE,

		      vif->ar->fw_capabilities))

		return;



	ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s fw bmiss enhance\n",

		   enable ? "enable" : "disable");



	err = ath6kl_wmi_sta_bmiss_enhance_cmd(vif->ar->wmi,

					       vif->fw_vif_idx, enable);

	if (err)

		ath6kl_err("failed to %s enhanced bmiss detection: %d\n",

			   enable ? "enable" : "disable", err);

}



static int ath6kl_get_rsn_capab(struct cfg80211_beacon_data *beacon,

				u8 *rsn_capab)

{
@@ -2776,9 +2772,11 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev, 


	ar->ap_mode_bkey.valid = false;



	/* TODO:

	 * info->interval

	 */

	ret = ath6kl_wmi_ap_set_beacon_intvl_cmd(ar->wmi, vif->fw_vif_idx,

						 info->beacon_interval);



	if (ret)

		ath6kl_warn("Failed to set beacon interval: %d\n", ret);



	ret = ath6kl_wmi_ap_set_dtim_cmd(ar->wmi, vif->fw_vif_idx,

					 info->dtim_period);
@@ -3557,6 +3555,37 @@ static int ath6kl_cfg80211_vif_init(struct ath6kl_vif *vif) 
	return 0;

}



void ath6kl_cfg80211_vif_stop(struct ath6kl_vif *vif, bool wmi_ready)

{

	static u8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

	bool discon_issued;



	netif_stop_queue(vif->ndev);



	clear_bit(WLAN_ENABLED, &vif->flags);



	if (wmi_ready) {

		discon_issued = test_bit(CONNECTED, &vif->flags) ||

				test_bit(CONNECT_PEND, &vif->flags);

		ath6kl_disconnect(vif);

		del_timer(&vif->disconnect_timer);



		if (discon_issued)

			ath6kl_disconnect_event(vif, DISCONNECT_CMD,

						(vif->nw_type & AP_NETWORK) ?

						bcast_mac : vif->bssid,

						0, NULL, 0);

	}



	if (vif->scan_req) {

		cfg80211_scan_done(vif->scan_req, true);

		vif->scan_req = NULL;

	}



	/* need to clean up enhanced bmiss detection fw state */

	ath6kl_cfg80211_sta_bmiss_enhance(vif, false);

}



void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif)

{

	struct ath6kl *ar = vif->ar;

drivers/net/wireless/ath/ath6kl/cfg80211.h

+0 −2
Original line number Diff line number Diff line
@@ -61,7 +61,5 @@ void ath6kl_cfg80211_cleanup(struct ath6kl *ar); 


struct ath6kl *ath6kl_cfg80211_create(void);

void ath6kl_cfg80211_destroy(struct ath6kl *ar);

/* TODO: remove this once ath6kl_vif_cleanup() is moved to cfg80211.c */

void ath6kl_cfg80211_sta_bmiss_enhance(struct ath6kl_vif *vif, bool enable);



#endif /* ATH6KL_CFG80211_H */