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

Commit a130883d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of... 

Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
parents d9f4fbaf 65a6538a

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -5062,6 +5062,16 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.g 
S:	Maintained

F:	drivers/net/wireless/rtl818x/rtl8187*



RTL8192CE WIRELESS DRIVER

M:	Larry Finger <Larry.Finger@lwfinger.net>

M:	Chaoming Li <chaoming_li@realsil.com.cn>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtlwifi/

F:	drivers/net/wireless/rtlwifi/rtl8192ce/



S3 SAVAGE FRAMEBUFFER DRIVER

M:	Antonino Daplas <adaplas@gmail.com>

L:	linux-fbdev@vger.kernel.org

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ source "drivers/net/wireless/libertas/Kconfig" 
source "drivers/net/wireless/orinoco/Kconfig"

source "drivers/net/wireless/p54/Kconfig"

source "drivers/net/wireless/rt2x00/Kconfig"

source "drivers/net/wireless/rtlwifi/Kconfig"

source "drivers/net/wireless/wl1251/Kconfig"

source "drivers/net/wireless/wl12xx/Kconfig"

source "drivers/net/wireless/zd1211rw/Kconfig"

drivers/net/wireless/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ obj-$(CONFIG_B43LEGACY) += b43legacy/ 
obj-$(CONFIG_ZD1211RW)		+= zd1211rw/

obj-$(CONFIG_RTL8180)		+= rtl818x/

obj-$(CONFIG_RTL8187)		+= rtl818x/

obj-$(CONFIG_RTL8192CE)		+= rtlwifi/



# 16-bit wireless PCMCIA client drivers

obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o

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

+27 −12
Original line number Diff line number Diff line
@@ -2351,6 +2351,10 @@ ath5k_init_softc(struct ath5k_softc *sc, const struct ath_bus_ops *bus_ops) 
		BIT(NL80211_IFTYPE_ADHOC) |

		BIT(NL80211_IFTYPE_MESH_POINT);



	/* both antennas can be configured as RX or TX */

	hw->wiphy->available_antennas_tx = 0x3;

	hw->wiphy->available_antennas_rx = 0x3;



	hw->extra_tx_headroom = 2;

	hw->channel_change_time = 5000;
@@ -2654,6 +2658,7 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan, 
							bool skip_pcu)

{

	struct ath5k_hw *ah = sc->ah;

	struct ath_common *common = ath5k_hw_common(ah);

	int ret, ani_mode;



	ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "resetting\n");
@@ -2696,6 +2701,14 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan, 
	ah->ah_cal_next_nf = jiffies;

	ewma_init(&ah->ah_beacon_rssi_avg, 1024, 8);



	/* clear survey data and cycle counters */

	memset(&sc->survey, 0, sizeof(sc->survey));

	spin_lock(&common->cc_lock);

	ath_hw_cycle_counters_update(common);

	memset(&common->cc_survey, 0, sizeof(common->cc_survey));

	memset(&common->cc_ani, 0, sizeof(common->cc_ani));

	spin_unlock(&common->cc_lock);



	/*

	 * Change channels and update the h/w rate map if we're switching;

	 * e.g. 11a to 11b/g.
@@ -3362,25 +3375,27 @@ static int ath5k_get_survey(struct ieee80211_hw *hw, int idx, 
	if (idx != 0)

		return -ENOENT;



	survey->channel = conf->channel;

	survey->filled = SURVEY_INFO_NOISE_DBM;

	survey->noise = sc->ah->ah_noise_floor;



	spin_lock_bh(&common->cc_lock);

	ath_hw_cycle_counters_update(common);

	if (cc->cycles > 0) {

		survey->filled |= SURVEY_INFO_CHANNEL_TIME |

			SURVEY_INFO_CHANNEL_TIME_BUSY |

			SURVEY_INFO_CHANNEL_TIME_RX |

			SURVEY_INFO_CHANNEL_TIME_TX;

		survey->channel_time += cc->cycles / div;

		survey->channel_time_busy += cc->rx_busy / div;

		survey->channel_time_rx += cc->rx_frame / div;

		survey->channel_time_tx += cc->tx_frame / div;

		sc->survey.channel_time += cc->cycles / div;

		sc->survey.channel_time_busy += cc->rx_busy / div;

		sc->survey.channel_time_rx += cc->rx_frame / div;

		sc->survey.channel_time_tx += cc->tx_frame / div;

	}

	memset(cc, 0, sizeof(*cc));

	spin_unlock_bh(&common->cc_lock);



	memcpy(survey, &sc->survey, sizeof(*survey));



	survey->channel = conf->channel;

	survey->noise = sc->ah->ah_noise_floor;

	survey->filled = SURVEY_INFO_NOISE_DBM |

			SURVEY_INFO_CHANNEL_TIME |

			SURVEY_INFO_CHANNEL_TIME_BUSY |

			SURVEY_INFO_CHANNEL_TIME_RX |

			SURVEY_INFO_CHANNEL_TIME_TX;



	return 0;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -258,6 +258,8 @@ struct ath5k_softc { 
	struct tasklet_struct	ani_tasklet;	/* ANI calibration */



	struct delayed_work	tx_complete_work;



	struct survey_info	survey;		/* collected survey info */

};



#define ath5k_hw_hasbssidmask(_ah) \