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

Commit e9e80ea5 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 2b12a4c5 56decd3c

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ config RTL8187 
	  Trendnet TEW-424UB

	  ASUS P5B Deluxe

	  Toshiba Satellite Pro series of laptops

	  Asus Wireless Link



	  Thanks to Realtek for their support!

drivers/net/wireless/ath5k/ath5k.h

+5 −3
Original line number Diff line number Diff line
@@ -186,11 +186,13 @@ struct ath5k_srev_name { 
#define AR5K_SREV_RAD_2111	0x20

#define AR5K_SREV_RAD_5112	0x30

#define AR5K_SREV_RAD_5112A	0x35

#define	AR5K_SREV_RAD_5112B	0x36

#define AR5K_SREV_RAD_2112	0x40

#define AR5K_SREV_RAD_2112A	0x45

#define AR5K_SREV_RAD_SC0	0x56	/* Found on 2413/2414 */

#define AR5K_SREV_RAD_SC1	0x63	/* Found on 5413/5414 */

#define AR5K_SREV_RAD_SC2	0xa2	/* Found on 2424-5/5424 */

#define	AR5K_SREV_RAD_2112B	0x46

#define AR5K_SREV_RAD_SC0	0x50	/* Found on 2413/2414 */

#define AR5K_SREV_RAD_SC1	0x60	/* Found on 5413/5414 */

#define AR5K_SREV_RAD_SC2	0xa0	/* Found on 2424-5/5424 */

#define AR5K_SREV_RAD_5133	0xc0	/* MIMO found on 5418 */



/* IEEE defs */

drivers/net/wireless/ath5k/base.c

+1 −0
Original line number Diff line number Diff line
@@ -2170,6 +2170,7 @@ ath5k_beacon_config(struct ath5k_softc *sc) 


	ath5k_hw_set_intr(ah, 0);

	sc->bmisscount = 0;

	sc->imask &= ~(AR5K_INT_BMISS | AR5K_INT_SWBA);



	if (sc->opmode == IEEE80211_IF_TYPE_STA) {

		sc->imask |= AR5K_INT_BMISS;

drivers/net/wireless/ath5k/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static struct reg regs[] = { 
	REG_STRUCT_INIT(AR5K_CPC1),

	REG_STRUCT_INIT(AR5K_CPC2),

	REG_STRUCT_INIT(AR5K_CPC3),

	REG_STRUCT_INIT(AR5K_CPCORN),

	REG_STRUCT_INIT(AR5K_CPCOVF),

	REG_STRUCT_INIT(AR5K_RESET_CTL),

	REG_STRUCT_INIT(AR5K_SLEEP_CTL),

	REG_STRUCT_INIT(AR5K_INTPEND),

drivers/net/wireless/ath5k/debug.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 


struct ath5k_softc;

struct ath5k_hw;

struct ieee80211_hw_mode;

struct sk_buff;

struct ath5k_buf;