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

Commit 41f4a6f7 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-2.6 into for-davem
parents 94d57c4c 1728943d

drivers/net/wireless/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ obj-$(CONFIG_ATH_COMMON) += ath/ 
obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o



obj-$(CONFIG_WL12XX)	+= wl12xx/

# small builtin driver bit

obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/wl12xx_platform_data.o

obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/



obj-$(CONFIG_IWM)	+= iwmc3200wifi/

drivers/net/wireless/airo.c

+0 −11
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ static const char *statsLabels[] = { 
   (no spaces) list of rates (up to 8). */



static int rates[8];

static int basic_rate;

static char *ssids[3];



static int io[4];
@@ -250,7 +249,6 @@ MODULE_LICENSE("Dual BSD/GPL"); 
MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350");

module_param_array(io, int, NULL, 0);

module_param_array(irq, int, NULL, 0);

module_param(basic_rate, int, 0);

module_param_array(rates, int, NULL, 0);

module_param_array(ssids, charp, NULL, 0);

module_param(auto_wep, int, 0);
@@ -3883,15 +3881,6 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) 
				ai->config.rates[i] = rates[i];

			}

		}

		if ( basic_rate > 0 ) {

			for( i = 0; i < 8; i++ ) {

				if ( ai->config.rates[i] == basic_rate ||

				     !ai->config.rates ) {

					ai->config.rates[i] = basic_rate | 0x80;

					break;

				}

			}

		}

		set_bit (FLAG_COMMIT, &ai->flags);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,6 @@ struct ath5k_hw { 
#define ah_modes		ah_capabilities.cap_mode

#define ah_ee_version		ah_capabilities.cap_eeprom.ee_version



	u32			ah_atim_window;

	u32			ah_limit_tx_retries;

	u8			ah_coverage_class;
@@ -1196,6 +1195,7 @@ u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah); 
void ath5k_hw_set_tsf64(struct ath5k_hw *ah, u64 tsf64);

void ath5k_hw_reset_tsf(struct ath5k_hw *ah);

void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval);

bool ath5k_hw_check_beacon_timers(struct ath5k_hw *ah, int intval);

/* ACK bit rate */

void ath5k_hw_set_ack_bitrate_high(struct ath5k_hw *ah, bool high);

/* Clock rate related functions */

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

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ int ath5k_hw_attach(struct ath5k_softc *sc) 
	ah->ah_turbo = false;

	ah->ah_txpower.txp_tpc = AR5K_TUNE_TPC_TXPOWER;

	ah->ah_imr = 0;

	ah->ah_atim_window = 0;

	ah->ah_limit_tx_retries = AR5K_INIT_TX_RETRY;

	ah->ah_software_retry = false;

	ah->ah_ant_mode = AR5K_ANTMODE_DEFAULT;

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

+14 −2
Original line number Diff line number Diff line
@@ -1191,6 +1191,15 @@ ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb, 
		 */

		if (hw_tu >= sc->nexttbtt)

			ath5k_beacon_update_timers(sc, bc_tstamp);



		/* Check if the beacon timers are still correct, because a TSF

		 * update might have created a window between them - for a

		 * longer description see the comment of this function: */

		if (!ath5k_hw_check_beacon_timers(sc->ah, sc->bintval)) {

			ath5k_beacon_update_timers(sc, bc_tstamp);

			ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON,

				"fixed beacon timers after beacon receive\n");

		}

	}

}
@@ -1877,8 +1886,11 @@ ath5k_beacon_update_timers(struct ath5k_softc *sc, u64 bc_tsf) 
	hw_tsf = ath5k_hw_get_tsf64(ah);

	hw_tu = TSF_TO_TU(hw_tsf);



#define FUDGE 3

	/* we use FUDGE to make sure the next TBTT is ahead of the current TU */

#define FUDGE AR5K_TUNE_SW_BEACON_RESP + 3

	/* We use FUDGE to make sure the next TBTT is ahead of the current TU.

	 * Since we later substract AR5K_TUNE_SW_BEACON_RESP (10) in the timer

	 * configuration we need to make sure it is bigger than that. */



	if (bc_tsf == -1) {

		/*

		 * no beacons received, called internally.