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

Commit 744595c8 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 c928febf 3092ad05

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

+3 −4
Original line number Diff line number Diff line
@@ -855,12 +855,11 @@ static void ath9k_hw_init_mode_gain_regs(struct ath_hw *ah) 
	}

}



static void ath9k_hw_init_11a_eeprom_fix(struct ath_hw *ah)

static void ath9k_hw_init_eeprom_fix(struct ath_hw *ah)

{

	u32 i, j;



	if ((ah->hw_version.devid == AR9280_DEVID_PCI) &&

	    test_bit(ATH9K_MODE_11A, ah->caps.wireless_modes)) {

	if (ah->hw_version.devid == AR9280_DEVID_PCI) {



		/* EEPROM Fixup */

		for (i = 0; i < ah->iniModes.ia_rows; i++) {
@@ -980,7 +979,7 @@ int ath9k_hw_init(struct ath_hw *ah) 
	if (r)

		return r;



	ath9k_hw_init_11a_eeprom_fix(ah);

	ath9k_hw_init_eeprom_fix(ah);



	r = ath9k_hw_init_macaddr(ah);

	if (r) {

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

+1 −1
Original line number Diff line number Diff line
@@ -2655,10 +2655,10 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, 
	    (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) {

		ath9k_ps_wakeup(sc);

		ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq);

		ath_beacon_return(sc, avp);

		ath9k_ps_restore(sc);

	}



	ath_beacon_return(sc, avp);

	sc->sc_flags &= ~SC_OP_BEACONS;



	for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) {

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

+2 −2
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, bool is_ap, u8 flags, 
}

EXPORT_SYMBOL(iwl_add_station);



static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const char *addr)

static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const u8 *addr)

{

	unsigned long flags;

	u8 sta_id = iwl_find_station(priv, addr);
@@ -324,7 +324,7 @@ static void iwl_remove_sta_callback(struct iwl_priv *priv, 
{

	struct iwl_rem_sta_cmd *rm_sta =

			(struct iwl_rem_sta_cmd *)cmd->cmd.payload;

	const char *addr = rm_sta->addr;

	const u8 *addr = rm_sta->addr;



	if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {

		IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n",

net/mac80211/driver-trace.h

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ TRACE_EVENT(drv_ampdu_action, 
		__entry->ret = ret;

		__entry->action = action;

		__entry->tid = tid;

		__entry->ssn = *ssn;

		__entry->ssn = ssn ? *ssn : 0;

	),



	TP_printk(