Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
a59b40b3
Commit
a59b40b3
authored
Dec 02, 2013
by
John W. Linville
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-john' of
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
parents
019b9528
0834ae3c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
net/mac80211/ibss.c
net/mac80211/ibss.c
+4
-0
net/wireless/core.c
net/wireless/core.c
+6
-0
No files found.
net/mac80211/ibss.c
View file @
a59b40b3
...
...
@@ -823,6 +823,10 @@ ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata,
if
(
err
)
return
false
;
/* channel switch is not supported, disconnect */
if
(
!
(
sdata
->
local
->
hw
.
wiphy
->
flags
&
WIPHY_FLAG_HAS_CHANNEL_SWITCH
))
goto
disconnect
;
params
.
count
=
csa_ie
.
count
;
params
.
chandef
=
csa_ie
.
chandef
;
...
...
net/wireless/core.c
View file @
a59b40b3
...
...
@@ -454,6 +454,12 @@ int wiphy_register(struct wiphy *wiphy)
/* support for 5/10 MHz is broken due to nl80211 API mess - disable */
wiphy
->
flags
&=
~
WIPHY_FLAG_SUPPORTS_5_10_MHZ
;
/*
* There are major locking problems in nl80211/mac80211 for CSA,
* disable for all drivers until this has been reworked.
*/
wiphy
->
flags
&=
~
WIPHY_FLAG_HAS_CHANNEL_SWITCH
;
#ifdef CONFIG_PM
if
(
WARN_ON
(
wiphy
->
wowlan
&&
(
wiphy
->
wowlan
->
flags
&
WIPHY_WOWLAN_GTK_REKEY_FAILURE
)
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment