Merge mac80211 driver from tree at bu3sch.de, pulled 24/6

[openwrt/openwrt.git] / package / mac80211 / src / mac80211 / ieee80211_i.h

diff --git a/package/mac80211/src/mac80211/ieee80211_i.h b/package/mac80211/src/mac80211/ieee80211_i.h
index 2bb34ffe07f2bfe43a134c26237f9e567e033829..880a73075e958cb959c1fe5c0115c639904d435f 100644 (file)
--- a/package/mac80211/src/mac80211/ieee80211_i.h
+++ b/package/mac80211/src/mac80211/ieee80211_i.h
@@ -296,6 +296,10 @@ struct ieee80211_if_sta {
 #define STA_TSDIR_NUM  2
        /* EDCA: 0~7, HCCA: 8~15 */
        struct sta_ts_data ts_data[STA_TSID_NUM][STA_TSDIR_NUM];
+#ifdef CONFIG_MAC80211_DEBUGFS
+       struct ieee80211_elem_tspec tspec;
+       u8 dls_mac[ETH_ALEN];
+#endif
 };
 
 
@@ -833,7 +837,6 @@ void ieee80211_update_default_wep_only(struct ieee80211_local *local);
 /* ieee80211_ioctl.c */
 int ieee80211_set_compression(struct ieee80211_local *local,
                              struct net_device *dev, struct sta_info *sta);
-int ieee80211_init_client(struct net_device *dev);
 int ieee80211_set_channel(struct ieee80211_local *local, int channel, int freq);
 /* ieee80211_sta.c */
 void ieee80211_sta_timer(unsigned long data);
@@ -873,7 +876,7 @@ void wmm_send_delts(struct net_device *dev,
                    struct ieee80211_elem_tspec *tp);
 void ieee80211_send_dls_req(struct net_device *dev,
                            struct ieee80211_if_sta *ifsta,
-                           u8 *addr, u32 timeout);
+                           u8 *addr, u16 timeout);
 void ieee80211_send_dls_teardown(struct net_device *dev,
                                 struct ieee80211_if_sta *ifsta,
                                 u8 *mac, u16 reason);
@@ -895,6 +898,10 @@ void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata);
 int ieee80211_if_add_mgmt(struct ieee80211_local *local);
 void ieee80211_if_del_mgmt(struct ieee80211_local *local);
 
+/* regdomain.c */
+void ieee80211_regdomain_init(void);
+void ieee80211_set_default_regdomain(struct ieee80211_hw_mode *mode);
+
 /* for wiphy privid */
 extern void *mac80211_wiphy_privid;