aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorAntonio Quartulli <ordex@autistici.org>2012-11-07 06:52:19 -0500
committerJohannes Berg <johannes.berg@intel.com>2012-11-07 11:57:14 -0500
commit06e191e22eb99ceeda60234502446c4c54492883 (patch)
tree1b9e2450b32120af45e3098f19252585b28b5984 /net/wireless
parent488dd7b53de9ea41edf7a475be63da51bdd05093 (diff)
cfg80211: store the ssid into wirless_dev in AP mode
Store the configured ssid in wdev->ssid when starting an AP Signed-off-by: Antonio Quartulli <ordex@autistici.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/ap.c1
-rw-r--r--net/wireless/nl80211.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/ap.c b/net/wireless/ap.c
index e143505f05bc..324e8d851dc4 100644
--- a/net/wireless/ap.c
+++ b/net/wireless/ap.c
@@ -28,6 +28,7 @@ static int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
28 if (!err) { 28 if (!err) {
29 wdev->beacon_interval = 0; 29 wdev->beacon_interval = 0;
30 wdev->channel = NULL; 30 wdev->channel = NULL;
31 wdev->ssid_len = 0;
31 } 32 }
32 33
33 return err; 34 return err;
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ba44f98c56d9..e521ca09d6a4 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -2649,6 +2649,8 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
2649 wdev->preset_chantype = params.channel_type; 2649 wdev->preset_chantype = params.channel_type;
2650 wdev->beacon_interval = params.beacon_interval; 2650 wdev->beacon_interval = params.beacon_interval;
2651 wdev->channel = params.channel; 2651 wdev->channel = params.channel;
2652 wdev->ssid_len = params.ssid_len;
2653 memcpy(wdev->ssid, params.ssid, wdev->ssid_len);
2652 } 2654 }
2653 return err; 2655 return err;
2654} 2656}