Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
raspberrypi-kernel
提交
416512cb
R
raspberrypi-kernel
项目概览
openeuler
/
raspberrypi-kernel
通知
13
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
raspberrypi-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
416512cb
编写于
18年前
作者:
J
John W. Linville
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'upstream-fixes' into upstream
上级
20f99dcf
ca0084fa
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
29 addition
and
9 deletion
+29
-9
drivers/net/wireless/Kconfig
drivers/net/wireless/Kconfig
+1
-0
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
+1
-1
drivers/net/wireless/orinoco.c
drivers/net/wireless/orinoco.c
+2
-2
drivers/net/wireless/zd1201.c
drivers/net/wireless/zd1201.c
+2
-0
net/ieee80211/Kconfig
net/ieee80211/Kconfig
+1
-0
net/ieee80211/softmac/ieee80211softmac_auth.c
net/ieee80211/softmac/ieee80211softmac_auth.c
+22
-6
未找到文件。
drivers/net/wireless/Kconfig
浏览文件 @
416512cb
...
@@ -447,6 +447,7 @@ config AIRO_CS
...
@@ -447,6 +447,7 @@ config AIRO_CS
tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)
depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)
select CRYPTO
select CRYPTO
select CRYPTO_AES
---help---
---help---
This is the standard Linux driver to support Cisco/Aironet PCMCIA
This is the standard Linux driver to support Cisco/Aironet PCMCIA
802.11 wireless cards. This driver is the same as the Aironet
802.11 wireless cards. This driver is the same as the Aironet
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/bcm43xx/bcm43xx_main.c
浏览文件 @
416512cb
...
@@ -3702,7 +3702,7 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev,
...
@@ -3702,7 +3702,7 @@ static void bcm43xx_ieee80211_set_security(struct net_device *net_dev,
}
}
if
(
sec
->
flags
&
SEC_AUTH_MODE
)
{
if
(
sec
->
flags
&
SEC_AUTH_MODE
)
{
secinfo
->
auth_mode
=
sec
->
auth_mode
;
secinfo
->
auth_mode
=
sec
->
auth_mode
;
dprintk
(
", .auth_mode = %d
\n
"
,
sec
->
auth_mode
);
dprintk
(
", .auth_mode = %d"
,
sec
->
auth_mode
);
}
}
dprintk
(
"
\n
"
);
dprintk
(
"
\n
"
);
if
(
bcm43xx_status
(
bcm
)
==
BCM43xx_STAT_INITIALIZED
&&
if
(
bcm43xx_status
(
bcm
)
==
BCM43xx_STAT_INITIALIZED
&&
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/orinoco.c
浏览文件 @
416512cb
...
@@ -2875,7 +2875,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,
...
@@ -2875,7 +2875,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,
if
(
orinoco_lock
(
priv
,
&
flags
)
!=
0
)
if
(
orinoco_lock
(
priv
,
&
flags
)
!=
0
)
return
-
EBUSY
;
return
-
EBUSY
;
if
(
erq
->
pointer
)
{
if
(
erq
->
length
>
0
)
{
if
((
index
<
0
)
||
(
index
>=
ORINOCO_MAX_KEYS
))
if
((
index
<
0
)
||
(
index
>=
ORINOCO_MAX_KEYS
))
index
=
priv
->
tx_key
;
index
=
priv
->
tx_key
;
...
@@ -2918,7 +2918,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,
...
@@ -2918,7 +2918,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,
if
(
erq
->
flags
&
IW_ENCODE_RESTRICTED
)
if
(
erq
->
flags
&
IW_ENCODE_RESTRICTED
)
restricted
=
1
;
restricted
=
1
;
if
(
erq
->
pointer
)
{
if
(
erq
->
pointer
&&
erq
->
length
>
0
)
{
priv
->
keys
[
index
].
len
=
cpu_to_le16
(
xlen
);
priv
->
keys
[
index
].
len
=
cpu_to_le16
(
xlen
);
memset
(
priv
->
keys
[
index
].
data
,
0
,
memset
(
priv
->
keys
[
index
].
data
,
0
,
sizeof
(
priv
->
keys
[
index
].
data
));
sizeof
(
priv
->
keys
[
index
].
data
));
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/zd1201.c
浏览文件 @
416512cb
...
@@ -1820,6 +1820,8 @@ static int zd1201_probe(struct usb_interface *interface,
...
@@ -1820,6 +1820,8 @@ static int zd1201_probe(struct usb_interface *interface,
zd
->
dev
->
name
);
zd
->
dev
->
name
);
usb_set_intfdata
(
interface
,
zd
);
usb_set_intfdata
(
interface
,
zd
);
zd1201_enable
(
zd
);
/* zd1201 likes to startup enabled, */
zd1201_disable
(
zd
);
/* interfering with all the wifis in range */
return
0
;
return
0
;
err_net:
err_net:
...
...
This diff is collapsed.
Click to expand it.
net/ieee80211/Kconfig
浏览文件 @
416512cb
...
@@ -58,6 +58,7 @@ config IEEE80211_CRYPT_TKIP
...
@@ -58,6 +58,7 @@ config IEEE80211_CRYPT_TKIP
depends on IEEE80211 && NET_RADIO
depends on IEEE80211 && NET_RADIO
select CRYPTO
select CRYPTO
select CRYPTO_MICHAEL_MIC
select CRYPTO_MICHAEL_MIC
select CRC32
---help---
---help---
Include software based cipher suites in support of IEEE 802.11i
Include software based cipher suites in support of IEEE 802.11i
(aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled
(aka TGi, WPA, WPA2, WPA-PSK, etc.) for use with TKIP enabled
...
...
This diff is collapsed.
Click to expand it.
net/ieee80211/softmac/ieee80211softmac_auth.c
浏览文件 @
416512cb
...
@@ -116,6 +116,16 @@ ieee80211softmac_auth_queue(void *data)
...
@@ -116,6 +116,16 @@ ieee80211softmac_auth_queue(void *data)
kfree
(
auth
);
kfree
(
auth
);
}
}
/* Sends a response to an auth challenge (for shared key auth). */
static
void
ieee80211softmac_auth_challenge_response
(
void
*
_aq
)
{
struct
ieee80211softmac_auth_queue_item
*
aq
=
_aq
;
/* Send our response */
ieee80211softmac_send_mgt_frame
(
aq
->
mac
,
aq
->
net
,
IEEE80211_STYPE_AUTH
,
aq
->
state
);
}
/* Handle the auth response from the AP
/* Handle the auth response from the AP
* This should be registered with ieee80211 as handle_auth
* This should be registered with ieee80211 as handle_auth
*/
*/
...
@@ -197,24 +207,30 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
...
@@ -197,24 +207,30 @@ ieee80211softmac_auth_resp(struct net_device *dev, struct ieee80211_auth *auth)
case
IEEE80211SOFTMAC_AUTH_SHARED_CHALLENGE
:
case
IEEE80211SOFTMAC_AUTH_SHARED_CHALLENGE
:
/* Check to make sure we have a challenge IE */
/* Check to make sure we have a challenge IE */
data
=
(
u8
*
)
auth
->
info_element
;
data
=
(
u8
*
)
auth
->
info_element
;
if
(
*
data
++
!=
MFIE_TYPE_CHALLENGE
)
{
if
(
*
data
++
!=
MFIE_TYPE_CHALLENGE
)
{
printkl
(
KERN_NOTICE
PFX
"Shared Key Authentication failed due to a missing challenge.
\n
"
);
printkl
(
KERN_NOTICE
PFX
"Shared Key Authentication failed due to a missing challenge.
\n
"
);
break
;
break
;
}
}
/* Save the challenge */
/* Save the challenge */
spin_lock_irqsave
(
&
mac
->
lock
,
flags
);
spin_lock_irqsave
(
&
mac
->
lock
,
flags
);
net
->
challenge_len
=
*
data
++
;
net
->
challenge_len
=
*
data
++
;
if
(
net
->
challenge_len
>
WLAN_AUTH_CHALLENGE_LEN
)
if
(
net
->
challenge_len
>
WLAN_AUTH_CHALLENGE_LEN
)
net
->
challenge_len
=
WLAN_AUTH_CHALLENGE_LEN
;
net
->
challenge_len
=
WLAN_AUTH_CHALLENGE_LEN
;
if
(
net
->
challenge
!=
NULL
)
if
(
net
->
challenge
!=
NULL
)
kfree
(
net
->
challenge
);
kfree
(
net
->
challenge
);
net
->
challenge
=
kmalloc
(
net
->
challenge_len
,
GFP_ATOMIC
);
net
->
challenge
=
kmalloc
(
net
->
challenge_len
,
GFP_ATOMIC
);
memcpy
(
net
->
challenge
,
data
,
net
->
challenge_len
);
memcpy
(
net
->
challenge
,
data
,
net
->
challenge_len
);
aq
->
state
=
IEEE80211SOFTMAC_AUTH_SHARED_RESPONSE
;
aq
->
state
=
IEEE80211SOFTMAC_AUTH_SHARED_RESPONSE
;
spin_unlock_irqrestore
(
&
mac
->
lock
,
flags
);
/* Send our response */
/* We reuse the work struct from the auth request here.
ieee80211softmac_send_mgt_frame
(
mac
,
aq
->
net
,
IEEE80211_STYPE_AUTH
,
aq
->
state
);
* It is safe to do so as each one is per-request, and
* at this point (dealing with authentication response)
* we have obviously already sent the initial auth
* request. */
cancel_delayed_work
(
&
aq
->
work
);
INIT_WORK
(
&
aq
->
work
,
&
ieee80211softmac_auth_challenge_response
,
(
void
*
)
aq
);
schedule_work
(
&
aq
->
work
);
spin_unlock_irqrestore
(
&
mac
->
lock
,
flags
);
return
0
;
return
0
;
case
IEEE80211SOFTMAC_AUTH_SHARED_PASS
:
case
IEEE80211SOFTMAC_AUTH_SHARED_PASS
:
kfree
(
net
->
challenge
);
kfree
(
net
->
challenge
);
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部