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
cabae811
Commit
cabae811
authored
May 06, 2014
by
John W. Linville
Browse files
Options
Browse Files
Download
Plain Diff
Merge
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
parents
3234f5b0
e669ba2d
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
9 deletions
+30
-9
include/net/cfg80211.h
include/net/cfg80211.h
+12
-0
net/mac80211/rx.c
net/mac80211/rx.c
+2
-1
net/mac80211/sta_info.c
net/mac80211/sta_info.c
+2
-1
net/mac80211/status.c
net/mac80211/status.c
+2
-3
net/mac80211/util.c
net/mac80211/util.c
+1
-1
net/wireless/scan.c
net/wireless/scan.c
+10
-2
net/wireless/sme.c
net/wireless/sme.c
+1
-1
No files found.
include/net/cfg80211.h
View file @
cabae811
...
@@ -3668,6 +3668,18 @@ void cfg80211_sched_scan_results(struct wiphy *wiphy);
...
@@ -3668,6 +3668,18 @@ void cfg80211_sched_scan_results(struct wiphy *wiphy);
*/
*/
void
cfg80211_sched_scan_stopped
(
struct
wiphy
*
wiphy
);
void
cfg80211_sched_scan_stopped
(
struct
wiphy
*
wiphy
);
/**
* cfg80211_sched_scan_stopped_rtnl - notify that the scheduled scan has stopped
*
* @wiphy: the wiphy on which the scheduled scan stopped
*
* The driver can call this function to inform cfg80211 that the
* scheduled scan had to be stopped, for whatever reason. The driver
* is then called back via the sched_scan_stop operation when done.
* This function should be called with rtnl locked.
*/
void
cfg80211_sched_scan_stopped_rtnl
(
struct
wiphy
*
wiphy
);
/**
/**
* cfg80211_inform_bss_width_frame - inform cfg80211 of a received BSS frame
* cfg80211_inform_bss_width_frame - inform cfg80211 of a received BSS frame
*
*
...
...
net/mac80211/rx.c
View file @
cabae811
...
@@ -1231,7 +1231,8 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
...
@@ -1231,7 +1231,8 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
if
(
ether_addr_equal
(
bssid
,
rx
->
sdata
->
u
.
ibss
.
bssid
)
&&
if
(
ether_addr_equal
(
bssid
,
rx
->
sdata
->
u
.
ibss
.
bssid
)
&&
test_sta_flag
(
sta
,
WLAN_STA_AUTHORIZED
))
{
test_sta_flag
(
sta
,
WLAN_STA_AUTHORIZED
))
{
sta
->
last_rx
=
jiffies
;
sta
->
last_rx
=
jiffies
;
if
(
ieee80211_is_data
(
hdr
->
frame_control
))
{
if
(
ieee80211_is_data
(
hdr
->
frame_control
)
&&
!
is_multicast_ether_addr
(
hdr
->
addr1
))
{
sta
->
last_rx_rate_idx
=
status
->
rate_idx
;
sta
->
last_rx_rate_idx
=
status
->
rate_idx
;
sta
->
last_rx_rate_flag
=
status
->
flag
;
sta
->
last_rx_rate_flag
=
status
->
flag
;
sta
->
last_rx_rate_vht_flag
=
status
->
vht_flag
;
sta
->
last_rx_rate_vht_flag
=
status
->
vht_flag
;
...
...
net/mac80211/sta_info.c
View file @
cabae811
...
@@ -1148,7 +1148,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
...
@@ -1148,7 +1148,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
atomic_dec
(
&
ps
->
num_sta_ps
);
atomic_dec
(
&
ps
->
num_sta_ps
);
/* This station just woke up and isn't aware of our SMPS state */
/* This station just woke up and isn't aware of our SMPS state */
if
(
!
ieee80211_smps_is_restrictive
(
sta
->
known_smps_mode
,
if
(
!
ieee80211_vif_is_mesh
(
&
sdata
->
vif
)
&&
!
ieee80211_smps_is_restrictive
(
sta
->
known_smps_mode
,
sdata
->
smps_mode
)
&&
sdata
->
smps_mode
)
&&
sta
->
known_smps_mode
!=
sdata
->
bss
->
req_smps
&&
sta
->
known_smps_mode
!=
sdata
->
bss
->
req_smps
&&
sta_info_tx_streams
(
sta
)
!=
1
)
{
sta_info_tx_streams
(
sta
)
!=
1
)
{
...
...
net/mac80211/status.c
View file @
cabae811
...
@@ -314,10 +314,9 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local,
...
@@ -314,10 +314,9 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local,
!
is_multicast_ether_addr
(
hdr
->
addr1
))
!
is_multicast_ether_addr
(
hdr
->
addr1
))
txflags
|=
IEEE80211_RADIOTAP_F_TX_FAIL
;
txflags
|=
IEEE80211_RADIOTAP_F_TX_FAIL
;
if
((
info
->
status
.
rates
[
0
].
flags
&
IEEE80211_TX_RC_USE_RTS_CTS
)
||
if
(
info
->
status
.
rates
[
0
].
flags
&
IEEE80211_TX_RC_USE_CTS_PROTECT
)
(
info
->
status
.
rates
[
0
].
flags
&
IEEE80211_TX_RC_USE_CTS_PROTECT
))
txflags
|=
IEEE80211_RADIOTAP_F_TX_CTS
;
txflags
|=
IEEE80211_RADIOTAP_F_TX_CTS
;
else
if
(
info
->
status
.
rates
[
0
].
flags
&
IEEE80211_TX_RC_USE_RTS_CTS
)
if
(
info
->
status
.
rates
[
0
].
flags
&
IEEE80211_TX_RC_USE_RTS_CTS
)
txflags
|=
IEEE80211_RADIOTAP_F_TX_RTS
;
txflags
|=
IEEE80211_RADIOTAP_F_TX_RTS
;
put_unaligned_le16
(
txflags
,
pos
);
put_unaligned_le16
(
txflags
,
pos
);
...
...
net/mac80211/util.c
View file @
cabae811
...
@@ -1780,7 +1780,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
...
@@ -1780,7 +1780,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
mutex_unlock
(
&
local
->
mtx
);
mutex_unlock
(
&
local
->
mtx
);
if
(
sched_scan_stopped
)
if
(
sched_scan_stopped
)
cfg80211_sched_scan_stopped
(
local
->
hw
.
wiphy
);
cfg80211_sched_scan_stopped
_rtnl
(
local
->
hw
.
wiphy
);
/*
/*
* If this is for hw restart things are still running.
* If this is for hw restart things are still running.
...
...
net/wireless/scan.c
View file @
cabae811
...
@@ -284,14 +284,22 @@ void cfg80211_sched_scan_results(struct wiphy *wiphy)
...
@@ -284,14 +284,22 @@ void cfg80211_sched_scan_results(struct wiphy *wiphy)
}
}
EXPORT_SYMBOL
(
cfg80211_sched_scan_results
);
EXPORT_SYMBOL
(
cfg80211_sched_scan_results
);
void
cfg80211_sched_scan_stopped
(
struct
wiphy
*
wiphy
)
void
cfg80211_sched_scan_stopped
_rtnl
(
struct
wiphy
*
wiphy
)
{
{
struct
cfg80211_registered_device
*
rdev
=
wiphy_to_dev
(
wiphy
);
struct
cfg80211_registered_device
*
rdev
=
wiphy_to_dev
(
wiphy
);
ASSERT_RTNL
();
trace_cfg80211_sched_scan_stopped
(
wiphy
);
trace_cfg80211_sched_scan_stopped
(
wiphy
);
rtnl_lock
();
__cfg80211_stop_sched_scan
(
rdev
,
true
);
__cfg80211_stop_sched_scan
(
rdev
,
true
);
}
EXPORT_SYMBOL
(
cfg80211_sched_scan_stopped_rtnl
);
void
cfg80211_sched_scan_stopped
(
struct
wiphy
*
wiphy
)
{
rtnl_lock
();
cfg80211_sched_scan_stopped_rtnl
(
wiphy
);
rtnl_unlock
();
rtnl_unlock
();
}
}
EXPORT_SYMBOL
(
cfg80211_sched_scan_stopped
);
EXPORT_SYMBOL
(
cfg80211_sched_scan_stopped
);
...
...
net/wireless/sme.c
View file @
cabae811
...
@@ -234,7 +234,6 @@ void cfg80211_conn_work(struct work_struct *work)
...
@@ -234,7 +234,6 @@ void cfg80211_conn_work(struct work_struct *work)
NULL
,
0
,
NULL
,
0
,
NULL
,
0
,
NULL
,
0
,
WLAN_STATUS_UNSPECIFIED_FAILURE
,
WLAN_STATUS_UNSPECIFIED_FAILURE
,
false
,
NULL
);
false
,
NULL
);
cfg80211_sme_free
(
wdev
);
}
}
wdev_unlock
(
wdev
);
wdev_unlock
(
wdev
);
}
}
...
@@ -648,6 +647,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
...
@@ -648,6 +647,7 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
cfg80211_unhold_bss
(
bss_from_pub
(
bss
));
cfg80211_unhold_bss
(
bss_from_pub
(
bss
));
cfg80211_put_bss
(
wdev
->
wiphy
,
bss
);
cfg80211_put_bss
(
wdev
->
wiphy
,
bss
);
}
}
cfg80211_sme_free
(
wdev
);
return
;
return
;
}
}
...
...
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