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

Commit 8f56874b 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-next-2.6

parents 47e1c323 159bcfeb

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -2816,6 +2816,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git 
S:	Supported

F:	drivers/net/wireless/iwlwifi/



INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)

M:	Samuel Ortiz <samuel.ortiz@intel.com>

M:	Zhu Yi <yi.zhu@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

W:	http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi

F:	drivers/net/wireless/iwmc3200wifi/



IOC3 ETHERNET DRIVER

M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-mips@linux-mips.org

drivers/net/wireless/airo.c

+1 −1
Original line number Diff line number Diff line
@@ -4806,7 +4806,7 @@ static int airo_config_commit(struct net_device *dev, 


static inline int sniffing_mode(struct airo_info *ai)

{

	return le16_to_cpu(ai->config.rmode & RXMODE_MASK) >=

	return (le16_to_cpu(ai->config.rmode) & le16_to_cpu(RXMODE_MASK)) >=

		le16_to_cpu(RXMODE_RFMON);

}

drivers/net/wireless/ath/ath9k/Kconfig

+4 −9
Original line number Diff line number Diff line
@@ -23,17 +23,12 @@ config ATH9K 


	  If you choose to build a module, it'll be called ath9k.



if ATH_DEBUG



config ATH9K_DEBUG

config ATH9K_DEBUGFS

	bool "Atheros ath9k debugging"

	depends on ATH9K

	---help---

	  Say Y, if you need ath9k to display debug messages.

	  Pass the debug mask as a module parameter:



	  modprobe ath9k debug=0x00000200

	  Say Y, if you need access to ath9k's statistics for

	  interrupts, rate control, etc.



	  Look in ath9k/debug.h for possible debug masks

	  Also required for changing debug message flags at run time.

endif # ATH_DEBUG

drivers/net/wireless/ath/ath9k/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ ath9k-y += beacon.o \ 


ath9k-$(CONFIG_PCI) += pci.o

ath9k-$(CONFIG_ATHEROS_AR71XX) += ahb.o

ath9k-$(CONFIG_ATH9K_DEBUG) += debug.o

ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o



obj-$(CONFIG_ATH9K) += ath9k.o

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

+6 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/device.h>

#include <linux/leds.h>



#include "rc.h"

#include "debug.h"

#include "common.h"
@@ -330,6 +329,7 @@ void ath_beacon_tasklet(unsigned long data); 
void ath_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif);

int ath_beacon_alloc(struct ath_wiphy *aphy, struct ieee80211_vif *vif);

void ath_beacon_return(struct ath_softc *sc, struct ath_vif *avp);

int ath_beaconq_config(struct ath_softc *sc);



/*******/

/* ANI */
@@ -421,8 +421,11 @@ struct ath_led { 
#define SC_OP_WAIT_FOR_TX_ACK   BIT(18)

#define SC_OP_BEACON_SYNC       BIT(19)

#define SC_OP_BT_PRIORITY_DETECTED BIT(21)

#define SC_OP_NULLFUNC_COMPLETED BIT(22)

#define SC_OP_PS_ENABLED	BIT(23)



struct ath_wiphy;

struct ath_rate_table;



struct ath_softc {

	struct ieee80211_hw *hw;
@@ -467,9 +470,8 @@ struct ath_softc { 
	struct ath_rx rx;

	struct ath_tx tx;

	struct ath_beacon beacon;

	struct ieee80211_rate rates[IEEE80211_NUM_BANDS][ATH_RATE_MAX];

	const struct ath_rate_table *hw_rate_table[ATH9K_MODE_MAX];

	const struct ath_rate_table *cur_rate_table;

	enum wireless_mode cur_rate_mode;

	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];



	struct ath_led radio_led;
@@ -484,7 +486,7 @@ struct ath_softc { 


	int beacon_interval;



#ifdef CONFIG_ATH9K_DEBUG

#ifdef CONFIG_ATH9K_DEBUGFS

	struct ath9k_debug debug;

#endif

	struct ath_beacon_config cur_beacon_conf;