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
Kirill Smelkov
linux
Commits
290eddc4
Commit
290eddc4
authored
Oct 17, 2012
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
8f7b8db6
3a40414f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
24 deletions
+35
-24
include/net/cfg80211.h
include/net/cfg80211.h
+1
-0
net/mac80211/mlme.c
net/mac80211/mlme.c
+23
-12
net/mac80211/wpa.c
net/mac80211/wpa.c
+8
-3
net/wireless/mlme.c
net/wireless/mlme.c
+3
-9
No files found.
include/net/cfg80211.h
View file @
290eddc4
...
...
@@ -1218,6 +1218,7 @@ struct cfg80211_deauth_request {
const
u8
*
ie
;
size_t
ie_len
;
u16
reason_code
;
bool
local_state_change
;
};
/**
...
...
net/mac80211/mlme.c
View file @
290eddc4
...
...
@@ -3099,22 +3099,32 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
ht_cfreq
,
ht_oper
->
primary_chan
,
cbss
->
channel
->
band
);
ht_oper
=
NULL
;
}
else
{
channel_type
=
NL80211_CHAN_HT20
;
}
}
if
(
ht_oper
)
{
channel_type
=
NL80211_CHAN_HT20
;
if
(
ht_oper
&&
sband
->
ht_cap
.
cap
&
IEEE80211_HT_CAP_SUP_WIDTH_20_40
)
{
/*
* cfg80211 already verified that the channel itself can
* be used, but it didn't check that we can do the right
* HT type, so do that here as well. If HT40 isn't allowed
* on this channel, disable 40 MHz operation.
*/
if
(
sband
->
ht_cap
.
cap
&
IEEE80211_HT_CAP_SUP_WIDTH_20_40
)
{
switch
(
ht_oper
->
ht_param
&
IEEE80211_HT_PARAM_CHA_SEC_OFFSET
)
{
case
IEEE80211_HT_PARAM_CHA_SEC_ABOVE
:
switch
(
ht_oper
->
ht_param
&
IEEE80211_HT_PARAM_CHA_SEC_OFFSET
)
{
case
IEEE80211_HT_PARAM_CHA_SEC_ABOVE
:
if
(
cbss
->
channel
->
flags
&
IEEE80211_CHAN_NO_HT40PLUS
)
ifmgd
->
flags
|=
IEEE80211_STA_DISABLE_40MHZ
;
else
channel_type
=
NL80211_CHAN_HT40PLUS
;
break
;
case
IEEE80211_HT_PARAM_CHA_SEC_BELOW
:
break
;
case
IEEE80211_HT_PARAM_CHA_SEC_BELOW
:
if
(
cbss
->
channel
->
flags
&
IEEE80211_CHAN_NO_HT40MINUS
)
ifmgd
->
flags
|=
IEEE80211_STA_DISABLE_40MHZ
;
else
channel_type
=
NL80211_CHAN_HT40MINUS
;
break
;
}
break
;
}
}
...
...
@@ -3549,6 +3559,7 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
{
struct
ieee80211_if_managed
*
ifmgd
=
&
sdata
->
u
.
mgd
;
u8
frame_buf
[
IEEE80211_DEAUTH_FRAME_LEN
];
bool
tx
=
!
req
->
local_state_change
;
mutex_lock
(
&
ifmgd
->
mtx
);
...
...
@@ -3565,12 +3576,12 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
if
(
ifmgd
->
associated
&&
ether_addr_equal
(
ifmgd
->
associated
->
bssid
,
req
->
bssid
))
{
ieee80211_set_disassoc
(
sdata
,
IEEE80211_STYPE_DEAUTH
,
req
->
reason_code
,
t
rue
,
frame_buf
);
req
->
reason_code
,
t
x
,
frame_buf
);
}
else
{
drv_mgd_prepare_tx
(
sdata
->
local
,
sdata
);
ieee80211_send_deauth_disassoc
(
sdata
,
req
->
bssid
,
IEEE80211_STYPE_DEAUTH
,
req
->
reason_code
,
t
rue
,
req
->
reason_code
,
t
x
,
frame_buf
);
}
...
...
net/mac80211/wpa.c
View file @
290eddc4
...
...
@@ -546,14 +546,19 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx)
static
void
bip_aad
(
struct
sk_buff
*
skb
,
u8
*
aad
)
{
__le16
mask_fc
;
struct
ieee80211_hdr
*
hdr
=
(
struct
ieee80211_hdr
*
)
skb
->
data
;
/* BIP AAD: FC(masked) || A1 || A2 || A3 */
/* FC type/subtype */
aad
[
0
]
=
skb
->
data
[
0
];
/* Mask FC Retry, PwrMgt, MoreData flags to zero */
aad
[
1
]
=
skb
->
data
[
1
]
&
~
(
BIT
(
4
)
|
BIT
(
5
)
|
BIT
(
6
));
mask_fc
=
hdr
->
frame_control
;
mask_fc
&=
~
cpu_to_le16
(
IEEE80211_FCTL_RETRY
|
IEEE80211_FCTL_PM
|
IEEE80211_FCTL_MOREDATA
);
put_unaligned
(
mask_fc
,
(
__le16
*
)
&
aad
[
0
]);
/* A1 || A2 || A3 */
memcpy
(
aad
+
2
,
skb
->
data
+
4
,
3
*
ETH_ALEN
);
memcpy
(
aad
+
2
,
&
hdr
->
addr1
,
3
*
ETH_ALEN
);
}
...
...
net/wireless/mlme.c
View file @
290eddc4
...
...
@@ -457,20 +457,14 @@ int __cfg80211_mlme_deauth(struct cfg80211_registered_device *rdev,
.
reason_code
=
reason
,
.
ie
=
ie
,
.
ie_len
=
ie_len
,
.
local_state_change
=
local_state_change
,
};
ASSERT_WDEV_LOCK
(
wdev
);
if
(
local_state_change
)
{
if
(
wdev
->
current_bss
&&
ether_addr_equal
(
wdev
->
current_bss
->
pub
.
bssid
,
bssid
))
{
cfg80211_unhold_bss
(
wdev
->
current_bss
);
cfg80211_put_bss
(
&
wdev
->
current_bss
->
pub
);
wdev
->
current_bss
=
NULL
;
}
if
(
local_state_change
&&
(
!
wdev
->
current_bss
||
!
ether_addr_equal
(
wdev
->
current_bss
->
pub
.
bssid
,
bssid
)))
return
0
;
}
return
rdev
->
ops
->
deauth
(
&
rdev
->
wiphy
,
dev
,
&
req
);
}
...
...
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