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

Commit c64557d6 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 1a63c353 0d91f22b

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -6461,8 +6461,7 @@ L: linux-wireless@vger.kernel.org 
W:	http://wireless.kernel.org

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

S:	Maintained

F:	drivers/net/wireless/wl12xx/*

X:	drivers/net/wireless/wl12xx/wl1271*

F:	drivers/net/wireless/wl1251/*



WL1271 WIRELESS DRIVER

M:	Luciano Coelho <luciano.coelho@nokia.com>

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/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
@@ -49,6 +49,7 @@ obj-$(CONFIG_ATH_COMMON) += ath/ 


obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o



obj-$(CONFIG_WL1251)	+= wl1251/

obj-$(CONFIG_WL12XX)	+= wl12xx/

obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx/

drivers/net/wireless/at76c50x-usb.c

+1 −2
Original line number Diff line number Diff line
@@ -1525,7 +1525,6 @@ static void at76_rx_tasklet(unsigned long param) 


	if (priv->device_unplugged) {

		at76_dbg(DBG_DEVSTART, "device unplugged");

		if (urb)

		at76_dbg(DBG_DEVSTART, "urb status %d", urb->status);

		return;

	}

drivers/net/wireless/ath/ath.h

+16 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <linux/skbuff.h>

#include <linux/if_ether.h>

#include <linux/spinlock.h>

#include <net/mac80211.h>



/*
@@ -42,6 +43,13 @@ struct ath_ani { 
	struct timer_list timer;

};



struct ath_cycle_counters {

	u32 cycles;

	u32 rx_busy;

	u32 rx_frame;

	u32 tx_frame;

};



enum ath_device_state {

	ATH_HW_UNAVAILABLE,

	ATH_HW_INITIALIZED,
@@ -145,6 +153,12 @@ struct ath_common { 
	DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX);

	enum ath_crypt_caps crypt_caps;



	unsigned int clockrate;



	spinlock_t cc_lock;

	struct ath_cycle_counters cc_ani;

	struct ath_cycle_counters cc_survey;



	struct ath_regulatory regulatory;

	const struct ath_ops *ops;

	const struct ath_bus_ops *bus_ops;
@@ -161,5 +175,7 @@ int ath_key_config(struct ath_common *common, 
			  struct ieee80211_sta *sta,

			  struct ieee80211_key_conf *key);

bool ath_hw_keyreset(struct ath_common *common, u16 entry);

void ath_hw_cycle_counters_update(struct ath_common *common);

int32_t ath_hw_get_listen_time(struct ath_common *common);



#endif /* ATH_H */