mac80211: convert to cfg80211 IBSS API
Johannes Berg
maintainerPATCH v4 1/1 mac80211: convert to cfg80211 IBSS API
This converts mac80211 to the new cfg80211 IBSS API, the wext handling functions are called where appropriate.
Signed-off-by Johannes Berg <[email protected]>
--- net/mac80211/cfg.c | 17 ++ net/mac80211/ibss.c | 353 +++++++++++++++++++++------------------------ net/mac80211/ieee80211_i.h | 35 +--- net/mac80211/iface.c | 12 - net/mac80211/main.c | 2 net/mac80211/scan.c | 2 net/mac80211/sta_info.c | 71 --------- net/mac80211/sta_info.h | 3 net/mac80211/tx.c | 6 net/mac80211/wext.c | 63 +++----- 10 files changed, 231 insertions(+), 333 deletions(-)
net/mac80211/ieee80211_i.h +13 -22
@@ -323,14 +323,6 @@ struct ieee80211_if_managed {size_t sme_auth_ie_len; }; -enum ieee80211_ibss_flags { -IEEE80211_IBSS_AUTO_CHANNEL_SEL =BIT (0 ), -IEEE80211_IBSS_AUTO_BSSID_SEL =BIT (1 ), -IEEE80211_IBSS_BSSID_SET =BIT (2 ), -IEEE80211_IBSS_PREV_BSSID_SET =BIT (3 ), -IEEE80211_IBSS_SSID_SET =BIT (4 ), -}; -enum ieee80211_ibss_request {IEEE80211_IBSS_REQ_RUN =0 , };
@@ -341,17 +333,20 @@ struct ieee80211_if_ibss {struct sk_buff_head skb_queue; -u8 ssid[IEEE80211_MAX_SSID_LEN ]; -u8 ssid_len; - -u32 flags; +unsigned long request; +unsigned long last_scan_completed; +bool fixed_bssid; +bool fixed_channel;u8 bssid[ETH_ALEN ]; - -unsigned long request; +u8 ssid[IEEE80211_MAX_SSID_LEN ]; +u8 ssid_len, ie_len; +u8 *ie; +struct ieee80211_channel *channel;unsigned long ibss_join_req; -struct sk_buff *probe_resp;/* ProbeResp template for IBSS */ +/* probe response/beacon for IBSS */ +struct sk_buff *presp, *skb;enum {IEEE80211_IBSS_MLME_SEARCH ,
@@ -630,8 +625,6 @@ struct ieee80211_local {spinlock_t sta_lock;unsigned long num_sta;struct list_head sta_list; -struct list_head sta_flush_list; -struct work_struct sta_flush_work;struct sta_info *sta_hash[STA_HASH_SIZE ];struct timer_list sta_cleanup;
@@ -681,7 +674,6 @@ struct ieee80211_local {int scan_ies_len;enum {SCAN_SET_CHANNEL ,SCAN_SEND_PROBE } scan_state; -unsigned long last_scan_completed;struct delayed_work scan_work;struct ieee80211_sub_if_data *scan_sdata;enum nl80211_channel_type oper_channel_type;
@@ -946,10 +938,6 @@ int ieee80211_max_network_latency(struct unsigned long data, void *dummy);/* IBSS code */ -int ieee80211_ibss_commit (struct ieee80211_sub_if_data *sdata); -int ieee80211_ibss_set_ssid (struct ieee80211_sub_if_data *sdata,char *ssid,size_t len); -int ieee80211_ibss_get_ssid (struct ieee80211_sub_if_data *sdata,char *ssid,size_t *len); -int ieee80211_ibss_set_bssid (struct ieee80211_sub_if_data *sdata,u8 *bssid);void ieee80211_ibss_notify_scan_completed (struct ieee80211_local *local);void ieee80211_ibss_setup_sdata (struct ieee80211_sub_if_data *sdata); ieee80211_rx_result
@@ -957,6 +945,9 @@ ieee80211_ibss_rx_mgmt(struct ieee80211_ struct ieee80211_rx_status *rx_status);struct sta_info *ieee80211_ibss_add_sta (struct ieee80211_sub_if_data *sdata,u8 *bssid,u8 *addr,u32 supp_rates); +int ieee80211_ibss_join (struct ieee80211_sub_if_data *sdata, +struct cfg80211_ibss_params *params); +int ieee80211_ibss_leave (struct ieee80211_sub_if_data *sdata);/* scan/BSS handling */ void ieee80211_scan_work (struct work_struct *work);
net/mac80211/wext.c +24 -39
140 lines not on this page · raw message
net/mac80211/ibss.c +168 -185
548 lines not on this page · raw message
net/mac80211/iface.c +3 -9
@@ -235,11 +235,7 @@ static int ieee80211_open(struct net_devnetif_addr_unlock_bh (local->mdev);break ;case NL80211_IFTYPE_STATION : -case NL80211_IFTYPE_ADHOC : -if (sdata->vif.type ==NL80211_IFTYPE_STATION ) - sdata->u.mgd.flags &= ~IEEE80211_STA_PREV_BSSID_SET ; -else - sdata->u.ibss.flags &= ~IEEE80211_IBSS_PREV_BSSID_SET ; + sdata->u.mgd.flags &= ~IEEE80211_STA_PREV_BSSID_SET ;/* fall through */ default : conf.vif = &sdata->vif;
@@ -327,8 +323,6 @@ static int ieee80211_open(struct net_dev*/ if (sdata->vif.type ==NL80211_IFTYPE_STATION )queue_work (local->hw.workqueue, &sdata->u.mgd.work); -else if (sdata->vif.type ==NL80211_IFTYPE_ADHOC ) -queue_work (local->hw.workqueue, &sdata->u.ibss.work);netif_tx_start_all_queues (dev);
@@ -499,7 +493,6 @@ static int ieee80211_stop(struct net_dev/* fall through */ case NL80211_IFTYPE_ADHOC :if (sdata->vif.type ==NL80211_IFTYPE_ADHOC ) { -memset (sdata->u.ibss.bssid,0 ,ETH_ALEN );del_timer_sync (&sdata->u.ibss.timer);cancel_work_sync (&sdata->u.ibss.work);synchronize_rcu ();
@@ -653,7 +646,8 @@ static void ieee80211_teardown_sdata(strmesh_rmc_free (sdata);break ;case NL80211_IFTYPE_ADHOC : -kfree_skb (sdata->u.ibss.probe_resp); +if (WARN_ON (sdata->u.ibss.presp)) +kfree_skb (sdata->u.ibss.presp);break ;case NL80211_IFTYPE_STATION :kfree (sdata->u.mgd.extra_ie);
net/mac80211/cfg.c +17 -0
@@ -1286,6 +1286,21 @@ static int ieee80211_disassoc(struct wipreturn ieee80211_sta_disassociate (sdata, req->reason_code); } +static int ieee80211_join_ibss (struct wiphy *wiphy,struct net_device *dev, +struct cfg80211_ibss_params *params) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); + +return ieee80211_ibss_join (sdata, params); +} + +static int ieee80211_leave_ibss (struct wiphy *wiphy,struct net_device *dev) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); + +return ieee80211_ibss_leave (sdata); +} +struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface,
@@ -1322,4 +1337,6 @@ struct cfg80211_ops mac80211_config_ops .assoc = ieee80211_assoc, .deauth = ieee80211_deauth, .disassoc = ieee80211_disassoc, + .join_ibss = ieee80211_join_ibss, + .leave_ibss = ieee80211_leave_ibss, };
net/mac80211/sta_info.c +1 -70
112 lines not on this page · raw message
net/mac80211/sta_info.h +1 -2
@@ -442,8 +442,7 @@ void sta_info_init(struct ieee80211_locaint sta_info_start (struct ieee80211_local *local);void sta_info_stop (struct ieee80211_local *local);int sta_info_flush (struct ieee80211_local *local, -struct ieee80211_sub_if_data *sdata); -void sta_info_flush_delayed (struct ieee80211_sub_if_data *sdata); +struct ieee80211_sub_if_data *sdata);void ieee80211_sta_expire (struct ieee80211_sub_if_data *sdata,unsigned long exp_time);
net/mac80211/main.c +1 -1
@@ -209,7 +209,7 @@ int ieee80211_if_config(struct ieee80211 !!rcu_dereference (sdata->u.ap.beacon);break ;case NL80211_IFTYPE_ADHOC : - conf.enable_beacon = !!sdata->u.ibss.probe_resp; + conf.enable_beacon = !!sdata->u.ibss.presp;break ;case NL80211_IFTYPE_MESH_POINT : conf.enable_beacon = true;
net/mac80211/tx.c +3 -3
@@ -2086,18 +2086,18 @@ struct sk_buff *ieee80211_beacon_get(str }else if (sdata->vif.type ==NL80211_IFTYPE_ADHOC ) {struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;struct ieee80211_hdr *hdr; +struct sk_buff *presp =rcu_dereference (ifibss->presp); -if (!ifibss->probe_resp) +if (!presp) goto out; - skb =skb_copy (ifibss->probe_resp,GFP_ATOMIC ); + skb =skb_copy (presp,GFP_ATOMIC );if (!skb) goto out; hdr = (struct ieee80211_hdr *) skb->data; hdr->frame_control =cpu_to_le16 (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_BEACON ); - }else if (ieee80211_vif_is_mesh (&sdata->vif)) {struct ieee80211_mgmt *mgmt;u8 *pos;
net/mac80211/scan.c +0 -2
@@ -295,8 +295,6 @@ void ieee80211_scan_completed(struct ieecfg80211_scan_done (local->scan_req, aborted); local->scan_req =NULL ; - local->last_scan_completed = jiffies; -if (local->hw_scanning) { local->hw_scanning = false;/*