From d2c8f773722e418881dc9204bb41897557116535 Mon Sep 17 00:00:00 2001 From: Michal Kazior Date: Fri, 29 Jun 2012 12:46:59 +0200 Subject: [PATCH] --- yaml --- r: 315191 b: refs/heads/master c: c30a3d38689bc601e03d5f2ad3c37d8ea13e46ca h: refs/heads/master i: 315189: eb4a9794e7ae9cf50e3072258e46acc2f529b338 315187: 4adef9450dee0a325a27c0867ceb3e16b02a1e44 315183: 9f3a3060b7752bcb62fb4f049862407560305102 v: v3 --- [refs] | 2 +- trunk/include/net/cfg80211.h | 2 ++ trunk/net/wireless/ibss.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 572a18026609..43ff515484d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4489ebeffa436c8427a20e2f05004e783708cde +refs/heads/master: c30a3d38689bc601e03d5f2ad3c37d8ea13e46ca diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h index c62bc7864adf..e030c6af86dd 100644 --- a/trunk/include/net/cfg80211.h +++ b/trunk/include/net/cfg80211.h @@ -2411,6 +2411,8 @@ struct wireless_dev { /* for AP and mesh channel tracking */ struct ieee80211_channel *channel; + bool ibss_fixed; + bool ps; int ps_timeout; diff --git a/trunk/net/wireless/ibss.c b/trunk/net/wireless/ibss.c index 89baa3328411..b90fd86b2d18 100644 --- a/trunk/net/wireless/ibss.c +++ b/trunk/net/wireless/ibss.c @@ -113,6 +113,7 @@ int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev, kfree(wdev->connect_keys); wdev->connect_keys = connkeys; + wdev->ibss_fixed = params->channel_fixed; #ifdef CONFIG_CFG80211_WEXT wdev->wext.ibss.channel = params->channel; #endif