Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/net/mac80211/ieee80211_i.h

 /*
  * Copyright 2002-2005, Instant802 Networks, Inc.
  * Copyright 2005, Devicescape Software, Inc.
  * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
  * Copyright 2007-2010  Johannes Berg <johannes@sipsolutions.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
@@ skipping 312 matching lines @@
 
 struct ieee80211_if_managed {
         struct timer_list timer;
         struct timer_list conn_mon_timer;
         struct timer_list bcn_mon_timer;
         struct timer_list chswitch_timer;
         struct work_struct monitor_work;
         struct work_struct chswitch_work;
         struct work_struct beacon_connection_loss_work;
         struct work_struct bitrate_notify_work;
-        struct work_struct probe_status_work;
 
-        unsigned long bloss_timeout;
+        unsigned long beacon_timeout;
         unsigned long probe_timeout;
         int probe_send_count;
-        bool probe_acked;
         bool tx_bitrate_changed;
 
         struct mutex mtx;
         struct cfg80211_bss *associated;
 
         u8 bssid[ETH_ALEN];
 
         u16 aid;
 
         unsigned long timers_running; /* used for quiesce/restart */
@@ skipping 20 matching lines @@
 
         /*
          * Weighted average of the signal strength from Beacon frames in the
          * current BSS. This is in units of 1/16 of the signal unit to maintain
          * accuracy and to speed up calculations, i.e., the value need to be
          * divided by 16 to get the actual value.
          */
         int ave_beacon_signal;
 
         /*
-         * Number of Beacon frames used in ave_beacon_signal. This can be used
-         * to avoid generating less reliable cqm events that would be based
-         * only on couple of received frames.
-         */
-        unsigned int count_beacon_signal;
-
-        /*
          * Last Beacon frame signal strength average (ave_beacon_signal / 16)
          * that triggered a cqm event. 0 indicates that no event has been
          * generated for the current association.
          */
         int last_cqm_event_signal;
 
 
         /*
          * Connection quality monitor bitrate threshold, a zero value
          * implies disabled
@@ skipping 744 matching lines @@
                                        struct ieee80211_sta_ht_cap *ht_cap);
 void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u16 ssn);
 void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata,
                           const u8 *da, u16 tid,
                           u16 initiator, u16 reason_code);
 int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata,
                                enum ieee80211_smps_mode smps, const u8 *da,
                                const u8 *bssid);
 
 void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
-                                     u16 initiator, u16 reason, bool stop);
+                                     u16 initiator, u16 reason);
 void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
-                                    u16 initiator, u16 reason, bool stop);
-void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta, bool tx);
+                                    u16 initiator, u16 reason);
+void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta);
 void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
                              struct sta_info *sta,
                              struct ieee80211_mgmt *mgmt, size_t len);
 void ieee80211_process_addba_resp(struct ieee80211_local *local,
                                   struct sta_info *sta,
                                   struct ieee80211_mgmt *mgmt,
                                   size_t len);
 void ieee80211_process_addba_request(struct ieee80211_local *local,
                                      struct sta_info *sta,
                                      struct ieee80211_mgmt *mgmt,
                                      size_t len);
 
 int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
-                                   enum ieee80211_back_parties initiator,
-                                   bool tx);
+                                   enum ieee80211_back_parties initiator);
 int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
-                                    enum ieee80211_back_parties initiator,
-                                    bool tx);
+                                    enum ieee80211_back_parties initiator);
 void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid);
 void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid);
 void ieee80211_ba_session_work(struct work_struct *work);
 void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid);
 
 /* Spectrum management */
 void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
                                        struct ieee80211_mgmt *mgmt,
                                        size_t len);
 
@@ skipping 40 matching lines @@
                               enum ieee80211_band band);
 
 void ieee80211_dynamic_ps_enable_work(struct work_struct *work);
 void ieee80211_dynamic_ps_disable_work(struct work_struct *work);
 void ieee80211_dynamic_ps_timer(unsigned long data);
 void ieee80211_send_nullfunc(struct ieee80211_local *local,
                              struct ieee80211_sub_if_data *sdata,
                              int powersave);
 void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,
                              struct ieee80211_hdr *hdr);
+void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata,
+                             struct ieee80211_hdr *hdr);
 void ieee80211_beacon_connection_loss_work(struct work_struct *work);
 
 void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,
                                      enum queue_stop_reason reason);
 void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw,
                                      enum queue_stop_reason reason);
 void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue,
                                     enum queue_stop_reason reason);
 void ieee80211_stop_queue_by_reason(struct ieee80211_hw *hw, int queue,
                                     enum queue_stop_reason reason);
@@ skipping 56 matching lines @@
                                 struct ieee80211_sub_if_data *sdata,
                                 enum nl80211_channel_type chantype);
 
 #ifdef CONFIG_MAC80211_NOINLINE
 #define debug_noinline noinline
 #else
 #define debug_noinline
 #endif
 
 #endif /* IEEE80211_I_H */