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

Commit e91db5cd 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 5f75a104 0a54917c

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

+8 −5
Original line number Diff line number Diff line
@@ -1917,7 +1917,8 @@ ath5k_beacon_send(struct ath5k_softc *sc) 
		sc->bmisscount = 0;

	}



	if (sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) {

	if ((sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) ||

			sc->opmode == NL80211_IFTYPE_MESH_POINT) {

		u64 tsf = ath5k_hw_get_tsf64(ah);

		u32 tsftu = TSF_TO_TU(tsf);

		int slot = ((tsftu % sc->bintval) * ATH_BCBUF) / sc->bintval;
@@ -1949,8 +1950,9 @@ ath5k_beacon_send(struct ath5k_softc *sc) 
		/* NB: hw still stops DMA, so proceed */

	}



	/* refresh the beacon for AP mode */

	if (sc->opmode == NL80211_IFTYPE_AP)

	/* refresh the beacon for AP or MESH mode */

	if (sc->opmode == NL80211_IFTYPE_AP ||

			sc->opmode == NL80211_IFTYPE_MESH_POINT)

		ath5k_beacon_update(sc->hw, vif);



	ath5k_hw_set_txdp(ah, sc->bhalq, bf->daddr);
@@ -2851,7 +2853,8 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, 


	/* Assign the vap/adhoc to a beacon xmit slot. */

	if ((avf->opmode == NL80211_IFTYPE_AP) ||

	    (avf->opmode == NL80211_IFTYPE_ADHOC)) {

	    (avf->opmode == NL80211_IFTYPE_ADHOC) ||

	    (avf->opmode == NL80211_IFTYPE_MESH_POINT)) {

		int slot;



		WARN_ON(list_empty(&sc->bcbuf));
@@ -2870,7 +2873,7 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, 
		sc->bslot[avf->bslot] = vif;

		if (avf->opmode == NL80211_IFTYPE_AP)

			sc->num_ap_vifs++;

		else

		else if (avf->opmode == NL80211_IFTYPE_ADHOC)

			sc->num_adhoc_vifs++;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp); 
struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype);

void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq);

int ath_tx_setup(struct ath_softc *sc, int haltype);

void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx);

bool ath_drain_all_txq(struct ath_softc *sc, bool retry_tx);

void ath_draintxq(struct ath_softc *sc,

		     struct ath_txq *txq, bool retry_tx);

void ath_tx_node_init(struct ath_softc *sc, struct ath_node *an);

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

+8 −4
Original line number Diff line number Diff line
@@ -1063,15 +1063,19 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, 
	case 1:

		break;

	case 2:

		if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)

			scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;

		else

			scaledPower = 0;

		break;

	case 3:

		if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN)

			scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;

		else

			scaledPower = 0;

		break;

	}



	scaledPower = max((u16)0, scaledPower);



	if (IS_CHAN_2GHZ(chan)) {

		numCtlModes = ARRAY_SIZE(ctlModesFor11g) -

			SUB_NUM_CTL_MODES_AT_2G_40;

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

+7 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,13 @@ static int ath9k_hif_usb_suspend(struct usb_interface *interface, 
	struct hif_device_usb *hif_dev =

		(struct hif_device_usb *) usb_get_intfdata(interface);



	/*

	 * The device has to be set to FULLSLEEP mode in case no

	 * interface is up.

	 */

	if (!(hif_dev->flags & HIF_USB_START))

		ath9k_htc_suspend(hif_dev->htc_handle);



	ath9k_hif_usb_dealloc_urbs(hif_dev);



	return 0;

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

+3 −0
Original line number Diff line number Diff line
@@ -455,6 +455,8 @@ u32 ath9k_htc_calcrxfilter(struct ath9k_htc_priv *priv); 
void ath9k_htc_ps_wakeup(struct ath9k_htc_priv *priv);

void ath9k_htc_ps_restore(struct ath9k_htc_priv *priv);

void ath9k_ps_work(struct work_struct *work);

bool ath9k_htc_setpower(struct ath9k_htc_priv *priv,

			enum ath9k_power_mode mode);



void ath9k_start_rfkill_poll(struct ath9k_htc_priv *priv);

void ath9k_init_leds(struct ath9k_htc_priv *priv);
@@ -464,6 +466,7 @@ int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev, 
			   u16 devid, char *product);

void ath9k_htc_disconnect_device(struct htc_target *htc_handle, bool hotunplug);

#ifdef CONFIG_PM

void ath9k_htc_suspend(struct htc_target *htc_handle);

int ath9k_htc_resume(struct htc_target *htc_handle);

#endif

#ifdef CONFIG_ATH9K_HTC_DEBUGFS