Commit 39338b56 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 into for-davem
parents 8b7ff200 eb1852b1

drivers/net/wireless/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ obj-$(CONFIG_ADM8211) += adm8211.o 
obj-$(CONFIG_MWL8K)	+= mwl8k.o



obj-$(CONFIG_IWLWIFI)	+= iwlwifi/

obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwlegacy/

obj-$(CONFIG_IWLEGACY)	+= iwlegacy/

obj-$(CONFIG_RT2X00)	+= rt2x00/



obj-$(CONFIG_P54_COMMON)	+= p54/

drivers/net/wireless/ath/ath6kl/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


obj-$(CONFIG_ATH6KL) := ath6kl.o

ath6kl-y += debug.o

ath6kl-y += htc_hif.o

ath6kl-y += hif.o

ath6kl-y += htc.o

ath6kl-y += bmi.o

ath6kl-y += cfg80211.o

drivers/net/wireless/ath/ath6kl/bmi.c

+5 −2
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ int ath6kl_bmi_done(struct ath6kl *ar) 
		return ret;

	}



	ath6kl_bmi_cleanup(ar);



	return 0;

}
@@ -672,6 +670,11 @@ int ath6kl_bmi_fast_download(struct ath6kl *ar, u32 addr, u8 *buf, u32 len) 
	return ret;

}



void ath6kl_bmi_reset(struct ath6kl *ar)

{

	ar->bmi.done_sent = false;

}



int ath6kl_bmi_init(struct ath6kl *ar)

{

	ar->bmi.cmd_buf = kzalloc(MAX_BMI_CMDBUF_SZ, GFP_ATOMIC);

drivers/net/wireless/ath/ath6kl/bmi.h

+2 −0
Original line number Diff line number Diff line
@@ -230,6 +230,8 @@ struct ath6kl_bmi_target_info { 


int ath6kl_bmi_init(struct ath6kl *ar);

void ath6kl_bmi_cleanup(struct ath6kl *ar);

void ath6kl_bmi_reset(struct ath6kl *ar);



int ath6kl_bmi_done(struct ath6kl *ar);

int ath6kl_bmi_get_target_info(struct ath6kl *ar,

			       struct ath6kl_bmi_target_info *targ_info);

drivers/net/wireless/ath/ath6kl/cfg80211.c

+1070 −358

File changed.

Preview size limit exceeded, changes collapsed.