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

Commit 08e554b1 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-2.6

parents 4efd7e83 062bee44

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ void ath_deinit_leds(struct ath_softc *sc); 
#define SC_OP_TSF_RESET              BIT(11)

#define SC_OP_BT_PRIORITY_DETECTED   BIT(12)

#define SC_OP_BT_SCAN		     BIT(13)

#define SC_OP_ANI_RUN		     BIT(14)



/* Powersave flags */

#define PS_WAIT_FOR_BEACON        BIT(0)

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

+10 −1
Original line number Diff line number Diff line
@@ -336,6 +336,10 @@ set_timer: 
static void ath_start_ani(struct ath_common *common)

{

	unsigned long timestamp = jiffies_to_msecs(jiffies);

	struct ath_softc *sc = (struct ath_softc *) common->priv;



	if (!(sc->sc_flags & SC_OP_ANI_RUN))

		return;



	common->ani.longcal_timer = timestamp;

	common->ani.shortcal_timer = timestamp;
@@ -872,11 +876,13 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc, 
		/* Reset rssi stats */

		sc->sc_ah->stats.avgbrssi = ATH_RSSI_DUMMY_MARKER;



		sc->sc_flags |= SC_OP_ANI_RUN;

		ath_start_ani(common);

	} else {

		ath_print(common, ATH_DBG_CONFIG, "Bss Info DISASSOC\n");

		common->curaid = 0;

		/* Stop ANI */

		sc->sc_flags &= ~SC_OP_ANI_RUN;

		del_timer_sync(&common->ani.timer);

	}

}
@@ -1478,8 +1484,10 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, 


	if (vif->type == NL80211_IFTYPE_AP    ||

	    vif->type == NL80211_IFTYPE_ADHOC ||

	    vif->type == NL80211_IFTYPE_MONITOR)

	    vif->type == NL80211_IFTYPE_MONITOR) {

		sc->sc_flags |= SC_OP_ANI_RUN;

		ath_start_ani(common);

	}



out:

	mutex_unlock(&sc->mutex);
@@ -1500,6 +1508,7 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, 
	mutex_lock(&sc->mutex);



	/* Stop ANI */

	sc->sc_flags &= ~SC_OP_ANI_RUN;

	del_timer_sync(&common->ani.timer);



	/* Reclaim beacon resources */

drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c

+1 −5
Original line number Diff line number Diff line
@@ -212,11 +212,7 @@ static void iwlagn_chain_noise_reset(struct iwl_priv *priv) 
static void iwlagn_rts_tx_cmd_flag(struct ieee80211_tx_info *info,

			__le32 *tx_flags)

{

	if ((info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) ||

	    (info->control.rates[0].flags & IEEE80211_TX_RC_USE_CTS_PROTECT))

	*tx_flags |= TX_CMD_FLG_RTS_CTS_MSK;

	else

		*tx_flags &= ~TX_CMD_FLG_RTS_CTS_MSK;

}



/* Calc max signal level (dBm) among 3 possible receivers */

drivers/net/wireless/iwlwifi/iwl-core.c

+6 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,6 @@ void iwl_configure_filter(struct ieee80211_hw *hw, 
			changed_flags, *total_flags);



	CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);

	CHK(FIF_ALLMULTI, RXON_FILTER_ACCEPT_GRP_MSK);

	CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK);

	CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);
@@ -1329,6 +1328,12 @@ void iwl_configure_filter(struct ieee80211_hw *hw, 


	mutex_unlock(&priv->mutex);



	/*

	 * Receiving all multicast frames is always enabled by the

	 * default flags setup in iwl_connection_init_rx_config()

	 * since we currently do not support programming multicast

	 * filters into the device.

	 */

	*total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |

			FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;

}