diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-07-22 17:51:16 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-22 17:51:16 -0400 |
commit | 41bf37117b47fc5ce2aae91f6a108e7e42e0b046 (patch) | |
tree | d5c8f24075313edfe548256dd931527f1569921e /drivers/net/wireless/ath/carl9170/carl9170.h | |
parent | 415b3334a21aa67806c52d1acf4e72e14f7f402f (diff) | |
parent | 6e6e8c510a84fe3237ef02b954e58cca6a3f4b1a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/carl9170.h')
-rw-r--r-- | drivers/net/wireless/ath/carl9170/carl9170.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h index f9a4655ea0b8..c5427a72a1e2 100644 --- a/drivers/net/wireless/ath/carl9170/carl9170.h +++ b/drivers/net/wireless/ath/carl9170/carl9170.h | |||
@@ -177,7 +177,7 @@ struct carl9170_tx_queue_stats { | |||
177 | 177 | ||
178 | struct carl9170_vif { | 178 | struct carl9170_vif { |
179 | unsigned int id; | 179 | unsigned int id; |
180 | struct ieee80211_vif *vif; | 180 | struct ieee80211_vif __rcu *vif; |
181 | }; | 181 | }; |
182 | 182 | ||
183 | struct carl9170_vif_info { | 183 | struct carl9170_vif_info { |
@@ -311,7 +311,7 @@ struct ar9170 { | |||
311 | spinlock_t beacon_lock; | 311 | spinlock_t beacon_lock; |
312 | unsigned int global_pretbtt; | 312 | unsigned int global_pretbtt; |
313 | unsigned int global_beacon_int; | 313 | unsigned int global_beacon_int; |
314 | struct carl9170_vif_info *beacon_iter; | 314 | struct carl9170_vif_info __rcu *beacon_iter; |
315 | unsigned int beacon_enabled; | 315 | unsigned int beacon_enabled; |
316 | 316 | ||
317 | /* cryptographic engine */ | 317 | /* cryptographic engine */ |
@@ -389,7 +389,7 @@ struct ar9170 { | |||
389 | /* tx ampdu */ | 389 | /* tx ampdu */ |
390 | struct work_struct ampdu_work; | 390 | struct work_struct ampdu_work; |
391 | spinlock_t tx_ampdu_list_lock; | 391 | spinlock_t tx_ampdu_list_lock; |
392 | struct carl9170_sta_tid *tx_ampdu_iter; | 392 | struct carl9170_sta_tid __rcu *tx_ampdu_iter; |
393 | struct list_head tx_ampdu_list; | 393 | struct list_head tx_ampdu_list; |
394 | atomic_t tx_ampdu_upload; | 394 | atomic_t tx_ampdu_upload; |
395 | atomic_t tx_ampdu_scheduler; | 395 | atomic_t tx_ampdu_scheduler; |
@@ -456,7 +456,7 @@ struct carl9170_sta_info { | |||
456 | bool sleeping; | 456 | bool sleeping; |
457 | atomic_t pending_frames; | 457 | atomic_t pending_frames; |
458 | unsigned int ampdu_max_len; | 458 | unsigned int ampdu_max_len; |
459 | struct carl9170_sta_tid *agg[CARL9170_NUM_TID]; | 459 | struct carl9170_sta_tid __rcu *agg[CARL9170_NUM_TID]; |
460 | struct carl9170_ba_stats stats[CARL9170_NUM_TID]; | 460 | struct carl9170_ba_stats stats[CARL9170_NUM_TID]; |
461 | }; | 461 | }; |
462 | 462 | ||
@@ -532,7 +532,6 @@ int carl9170_set_ampdu_settings(struct ar9170 *ar); | |||
532 | int carl9170_set_slot_time(struct ar9170 *ar); | 532 | int carl9170_set_slot_time(struct ar9170 *ar); |
533 | int carl9170_set_mac_rates(struct ar9170 *ar); | 533 | int carl9170_set_mac_rates(struct ar9170 *ar); |
534 | int carl9170_set_hwretry_limit(struct ar9170 *ar, const u32 max_retry); | 534 | int carl9170_set_hwretry_limit(struct ar9170 *ar, const u32 max_retry); |
535 | int carl9170_update_beacon(struct ar9170 *ar, const bool submit); | ||
536 | int carl9170_upload_key(struct ar9170 *ar, const u8 id, const u8 *mac, | 535 | int carl9170_upload_key(struct ar9170 *ar, const u8 id, const u8 *mac, |
537 | const u8 ktype, const u8 keyidx, const u8 *keydata, const int keylen); | 536 | const u8 ktype, const u8 keyidx, const u8 *keydata, const int keylen); |
538 | int carl9170_disable_key(struct ar9170 *ar, const u8 id); | 537 | int carl9170_disable_key(struct ar9170 *ar, const u8 id); |
@@ -553,6 +552,7 @@ void carl9170_tx_drop(struct ar9170 *ar, struct sk_buff *skb); | |||
553 | void carl9170_tx_scheduler(struct ar9170 *ar); | 552 | void carl9170_tx_scheduler(struct ar9170 *ar); |
554 | void carl9170_tx_get_skb(struct sk_buff *skb); | 553 | void carl9170_tx_get_skb(struct sk_buff *skb); |
555 | int carl9170_tx_put_skb(struct sk_buff *skb); | 554 | int carl9170_tx_put_skb(struct sk_buff *skb); |
555 | int carl9170_update_beacon(struct ar9170 *ar, const bool submit); | ||
556 | 556 | ||
557 | /* LEDs */ | 557 | /* LEDs */ |
558 | #ifdef CONFIG_CARL9170_LEDS | 558 | #ifdef CONFIG_CARL9170_LEDS |