diff options
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 3cc3867c5418..2873f6374d1a 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -325,7 +325,6 @@ struct ieee80211_if_managed { | |||
325 | struct timer_list conn_mon_timer; | 325 | struct timer_list conn_mon_timer; |
326 | struct timer_list bcn_mon_timer; | 326 | struct timer_list bcn_mon_timer; |
327 | struct timer_list chswitch_timer; | 327 | struct timer_list chswitch_timer; |
328 | struct work_struct work; | ||
329 | struct work_struct monitor_work; | 328 | struct work_struct monitor_work; |
330 | struct work_struct chswitch_work; | 329 | struct work_struct chswitch_work; |
331 | struct work_struct beacon_connection_loss_work; | 330 | struct work_struct beacon_connection_loss_work; |
@@ -384,7 +383,6 @@ enum ieee80211_ibss_request { | |||
384 | 383 | ||
385 | struct ieee80211_if_ibss { | 384 | struct ieee80211_if_ibss { |
386 | struct timer_list timer; | 385 | struct timer_list timer; |
387 | struct work_struct work; | ||
388 | 386 | ||
389 | unsigned long request; | 387 | unsigned long request; |
390 | unsigned long last_scan_completed; | 388 | unsigned long last_scan_completed; |
@@ -412,7 +410,6 @@ struct ieee80211_if_ibss { | |||
412 | }; | 410 | }; |
413 | 411 | ||
414 | struct ieee80211_if_mesh { | 412 | struct ieee80211_if_mesh { |
415 | struct work_struct work; | ||
416 | struct timer_list housekeeping_timer; | 413 | struct timer_list housekeeping_timer; |
417 | struct timer_list mesh_path_timer; | 414 | struct timer_list mesh_path_timer; |
418 | struct timer_list mesh_path_root_timer; | 415 | struct timer_list mesh_path_root_timer; |
@@ -512,6 +509,7 @@ struct ieee80211_sub_if_data { | |||
512 | 509 | ||
513 | u16 sequence_number; | 510 | u16 sequence_number; |
514 | 511 | ||
512 | struct work_struct work; | ||
515 | struct sk_buff_head skb_queue; | 513 | struct sk_buff_head skb_queue; |
516 | 514 | ||
517 | /* | 515 | /* |