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

Commit 9c461cef authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-linville' of git://github.com/kvalo/ath6kl

parents b4487c2d 8cb6d991

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.

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

+24 −6
Original line number Diff line number Diff line
@@ -17,23 +17,41 @@ 
#ifndef ATH6KL_CFG80211_H

#define ATH6KL_CFG80211_H



struct wireless_dev *ath6kl_cfg80211_init(struct device *dev);

void ath6kl_cfg80211_deinit(struct ath6kl *ar);

enum ath6kl_cfg_suspend_mode {

	ATH6KL_CFG_SUSPEND_DEEPSLEEP,

	ATH6KL_CFG_SUSPEND_CUTPOWER,

	ATH6KL_CFG_SUSPEND_WOW

};



void ath6kl_cfg80211_scan_complete_event(struct ath6kl *ar, int status);

struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,

					enum nl80211_iftype type,

					u8 fw_vif_idx, u8 nw_type);

int ath6kl_register_ieee80211_hw(struct ath6kl *ar);

struct ath6kl *ath6kl_core_alloc(struct device *dev);

void ath6kl_deinit_ieee80211_hw(struct ath6kl *ar);



void ath6kl_cfg80211_connect_event(struct ath6kl *ar, u16 channel,

void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted);



void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,

				   u8 *bssid, u16 listen_intvl,

				   u16 beacon_intvl,

				   enum network_type nw_type,

				   u8 beacon_ie_len, u8 assoc_req_len,

				   u8 assoc_resp_len, u8 *assoc_info);



void ath6kl_cfg80211_disconnect_event(struct ath6kl *ar, u8 reason,

void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason,

				      u8 *bssid, u8 assoc_resp_len,

				      u8 *assoc_info, u16 proto_reason);



void ath6kl_cfg80211_tkip_micerr_event(struct ath6kl *ar, u8 keyid,

void ath6kl_cfg80211_tkip_micerr_event(struct ath6kl_vif *vif, u8 keyid,

				     bool ismcast);



int ath6kl_cfg80211_suspend(struct ath6kl *ar,

			    enum ath6kl_cfg_suspend_mode mode,

			    struct cfg80211_wowlan *wow);



int ath6kl_cfg80211_resume(struct ath6kl *ar);



void ath6kl_cfg80211_stop(struct ath6kl *ar);



#endif /* ATH6KL_CFG80211_H */