nl80211: allow configuring IBSS beacon interval
Make the JOIN_IBSS command look at the beacon interval attribute to see if the user requested a specific beacon interval, if not default to 100 TU (wext too). Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
e255d5eb2b
commit
8e30bc55de
@@ -116,6 +116,9 @@ static int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev,
|
||||
enum ieee80211_band band;
|
||||
int i;
|
||||
|
||||
if (!wdev->wext.beacon_interval)
|
||||
wdev->wext.beacon_interval = 100;
|
||||
|
||||
/* try to find an IBSS channel if none requested ... */
|
||||
if (!wdev->wext.channel) {
|
||||
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
|
||||
|
@@ -3159,6 +3159,8 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info)
|
||||
struct wiphy *wiphy;
|
||||
int err;
|
||||
|
||||
memset(&ibss, 0, sizeof(ibss));
|
||||
|
||||
if (!is_valid_ie_attr(info->attrs[NL80211_ATTR_IE]))
|
||||
return -EINVAL;
|
||||
|
||||
@@ -3167,6 +3169,15 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info)
|
||||
!nla_len(info->attrs[NL80211_ATTR_SSID]))
|
||||
return -EINVAL;
|
||||
|
||||
ibss.beacon_interval = 100;
|
||||
|
||||
if (info->attrs[NL80211_ATTR_BEACON_INTERVAL]) {
|
||||
ibss.beacon_interval =
|
||||
nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]);
|
||||
if (ibss.beacon_interval < 1 || ibss.beacon_interval > 10000)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
rtnl_lock();
|
||||
|
||||
err = get_drv_dev_by_info_ifindex(info->attrs, &drv, &dev);
|
||||
@@ -3189,7 +3200,6 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info)
|
||||
}
|
||||
|
||||
wiphy = &drv->wiphy;
|
||||
memset(&ibss, 0, sizeof(ibss));
|
||||
|
||||
if (info->attrs[NL80211_ATTR_MAC])
|
||||
ibss.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]);
|
||||
|
Reference in New Issue
Block a user