mac80211: New stat counters for multicast and unicast forwarded frames

[pandora-kernel.git] / net / mac80211 / ieee80211_i.h

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index efda19e..93e618a 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -24,7 +24,6 @@
 #include <linux/spinlock.h>
 #include <linux/etherdevice.h>
 #include <net/cfg80211.h>
-#include <net/iw_handler.h>
 #include <net/mac80211.h>
 #include "key.h"
 #include "sta_info.h"
@@ -213,7 +212,9 @@ struct ieee80211_if_vlan {
 };
 
 struct mesh_stats {
-       __u32 fwded_frames;             /* Mesh forwarded frames */
+       __u32 fwded_mcast;              /* Mesh forwarded multicast frames */
+       __u32 fwded_unicast;            /* Mesh forwarded unicast frames */
+       __u32 fwded_frames;             /* Mesh total forwarded frames */
        __u32 dropped_frames_ttl;       /* Not transmitted since mesh_ttl == 0*/
        __u32 dropped_frames_no_route;  /* Not transmitted, no route found */
        atomic_t estab_plinks;
@@ -281,9 +282,11 @@ struct ieee80211_if_managed {
        struct work_struct beacon_loss_work;
 
        unsigned long probe_timeout;
+       int probe_send_count;
 
        struct mutex mtx;
        struct ieee80211_bss *associated;
+       struct ieee80211_mgd_work *old_associate_work;
        struct list_head work_list;
 
        u8 bssid[ETH_ALEN];
@@ -354,7 +357,7 @@ struct ieee80211_if_mesh {
 
        unsigned long timers_running;
 
-       bool housekeeping;
+       unsigned long wrkq_flags;
 
        u8 mesh_id[IEEE80211_MAX_MESH_ID_LEN];
        size_t mesh_id_len;
@@ -505,6 +508,8 @@ struct ieee80211_sub_if_data {
 #ifdef CONFIG_MAC80211_MESH
        struct dentry *mesh_stats_dir;
        struct {
+               struct dentry *fwded_mcast;
+               struct dentry *fwded_unicast;
                struct dentry *fwded_frames;
                struct dentry *dropped_frames_ttl;
                struct dentry *dropped_frames_no_route;
@@ -615,6 +620,12 @@ struct ieee80211_local {
 
        const struct ieee80211_ops *ops;
 
+       /*
+        * private workqueue to mac80211. mac80211 makes this accessible
+        * via ieee80211_queue_work()
+        */
+       struct workqueue_struct *workqueue;
+
        unsigned long queue_stop_reasons[IEEE80211_MAX_QUEUES];
        /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
        spinlock_t queue_stop_reason_lock;
@@ -622,13 +633,16 @@ struct ieee80211_local {
        int open_count;
        int monitors, cooked_mntrs;
        /* number of interfaces with corresponding FIF_ flags */
-       int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss;
+       int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
        unsigned int filter_flags; /* FIF_* */
        struct iw_statistics wstats;
 
        /* protects the aggregated multicast list and filter calls */
        spinlock_t filter_lock;
 
+       /* used for uploading changed mc list */
+       struct work_struct reconfig_filter;
+
        /* aggregated multicast list */
        struct dev_addr_list *mc_list;
        int mc_count;
@@ -671,6 +685,7 @@ struct ieee80211_local {
        struct list_head sta_list;
        struct sta_info *sta_hash[STA_HASH_SIZE];
        struct timer_list sta_cleanup;
+       int sta_generation;
 
        struct sk_buff_head pending[IEEE80211_MAX_QUEUES];
        struct tasklet_struct tx_pending_tasklet;
@@ -707,7 +722,7 @@ struct ieee80211_local {
        struct mutex scan_mtx;
        unsigned long scanning;
        struct cfg80211_ssid scan_ssid;
-       struct cfg80211_scan_request int_scan_req;
+       struct cfg80211_scan_request *int_scan_req;
        struct cfg80211_scan_request *scan_req;
        struct ieee80211_channel *scan_channel;
        const u8 *orig_ies;
@@ -715,7 +730,7 @@ struct ieee80211_local {
        int scan_channel_idx;
        int scan_ies_len;
 
-       enum mac80211_scan_state scan_state;
+       enum mac80211_scan_state next_scan_state;
        struct delayed_work scan_work;
        struct ieee80211_sub_if_data *scan_sdata;
        enum nl80211_channel_type oper_channel_type;
@@ -951,9 +966,6 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
 void ieee80211_configure_filter(struct ieee80211_local *local);
 u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata);
 
-/* wireless extensions */
-extern const struct iw_handler_def ieee80211_iw_handler_def;
-
 /* STA code */
 void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata);
 int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,