git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
htc.h
diff --git
a/drivers/net/wireless/ath/ath9k/htc.h
b/drivers/net/wireless/ath/ath9k/htc.h
index
a099b3e
..
6354986
100644
(file)
--- a/
drivers/net/wireless/ath/ath9k/htc.h
+++ b/
drivers/net/wireless/ath/ath9k/htc.h
@@
-78,7
+78,7
@@
struct tx_frame_hdr {
u8 node_idx;
u8 vif_idx;
u8 tidno;
u8 node_idx;
u8 vif_idx;
u8 tidno;
-
u
32 flags; /* ATH9K_HTC_TX_* */
+
__be
32 flags; /* ATH9K_HTC_TX_* */
u8 key_type;
u8 keyix;
u8 reserved[26];
u8 key_type;
u8 keyix;
u8 reserved[26];
@@
-366,7
+366,7
@@
struct ath9k_htc_priv {
u16 seq_no;
u32 bmiss_cnt;
u16 seq_no;
u32 bmiss_cnt;
- struct ath9k_hw_cal_data caldata
[ATH9K_NUM_CHANNELS]
;
+ struct ath9k_hw_cal_data caldata;
spinlock_t beacon_lock;
spinlock_t beacon_lock;
@@
-433,6
+433,7
@@
void ath9k_htc_txep(void *priv, struct sk_buff *skb, enum htc_endpoint_id ep_id,
void ath9k_htc_beaconep(void *drv_priv, struct sk_buff *skb,
enum htc_endpoint_id ep_id, bool txok);
void ath9k_htc_beaconep(void *drv_priv, struct sk_buff *skb,
enum htc_endpoint_id ep_id, bool txok);
+int ath9k_htc_update_cap_target(struct ath9k_htc_priv *priv);
void ath9k_htc_station_work(struct work_struct *work);
void ath9k_htc_aggr_work(struct work_struct *work);
void ath9k_ani_work(struct work_struct *work);;
void ath9k_htc_station_work(struct work_struct *work);
void ath9k_htc_aggr_work(struct work_struct *work);
void ath9k_ani_work(struct work_struct *work);;