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
161915a0
Commit
161915a0
authored
Jul 29, 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
718803d1
23df0b73
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
net/mac80211/mesh_ps.c
net/mac80211/mesh_ps.c
+4
-0
net/mac80211/pm.c
net/mac80211/pm.c
+5
-2
net/wireless/reg.c
net/wireless/reg.c
+4
-1
No files found.
net/mac80211/mesh_ps.c
View file @
161915a0
...
@@ -229,6 +229,10 @@ void ieee80211_mps_sta_status_update(struct sta_info *sta)
...
@@ -229,6 +229,10 @@ void ieee80211_mps_sta_status_update(struct sta_info *sta)
enum
nl80211_mesh_power_mode
pm
;
enum
nl80211_mesh_power_mode
pm
;
bool
do_buffer
;
bool
do_buffer
;
/* For non-assoc STA, prevent buffering or frame transmission */
if
(
sta
->
sta_state
<
IEEE80211_STA_ASSOC
)
return
;
/*
/*
* use peer-specific power mode if peering is established and the
* use peer-specific power mode if peering is established and the
* peer's power mode is known
* peer's power mode is known
...
...
net/mac80211/pm.c
View file @
161915a0
...
@@ -99,10 +99,13 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
...
@@ -99,10 +99,13 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
}
}
mutex_unlock
(
&
local
->
sta_mtx
);
mutex_unlock
(
&
local
->
sta_mtx
);
/* remove all interfaces */
/* remove all interfaces
that were created in the driver
*/
list_for_each_entry
(
sdata
,
&
local
->
interfaces
,
list
)
{
list_for_each_entry
(
sdata
,
&
local
->
interfaces
,
list
)
{
if
(
!
ieee80211_sdata_running
(
sdata
))
if
(
!
ieee80211_sdata_running
(
sdata
)
||
sdata
->
vif
.
type
==
NL80211_IFTYPE_AP_VLAN
||
sdata
->
vif
.
type
==
NL80211_IFTYPE_MONITOR
)
continue
;
continue
;
drv_remove_interface
(
local
,
sdata
);
drv_remove_interface
(
local
,
sdata
);
}
}
...
...
net/wireless/reg.c
View file @
161915a0
...
@@ -2247,10 +2247,13 @@ int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
...
@@ -2247,10 +2247,13 @@ int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
void
wiphy_regulatory_register
(
struct
wiphy
*
wiphy
)
void
wiphy_regulatory_register
(
struct
wiphy
*
wiphy
)
{
{
struct
regulatory_request
*
lr
;
if
(
!
reg_dev_ignore_cell_hint
(
wiphy
))
if
(
!
reg_dev_ignore_cell_hint
(
wiphy
))
reg_num_devs_support_basehint
++
;
reg_num_devs_support_basehint
++
;
wiphy_update_regulatory
(
wiphy
,
NL80211_REGDOM_SET_BY_CORE
);
lr
=
get_last_request
();
wiphy_update_regulatory
(
wiphy
,
lr
->
initiator
);
}
}
void
wiphy_regulatory_deregister
(
struct
wiphy
*
wiphy
)
void
wiphy_regulatory_deregister
(
struct
wiphy
*
wiphy
)
...
...
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