Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
51c83a94
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
161
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
51c83a94
编写于
19年前
作者:
J
Jeff Garzik
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'upstream-fixes' of
git://git.tuxdriver.com/git/netdev-jwl
上级
cea00da3
eaf8f53b
master
alk-4.19.24
alk-4.19.30
alk-4.19.34
alk-4.19.36
alk-4.19.43
alk-4.19.48
alk-4.19.57
ck-4.19.67
ck-4.19.81
ck-4.19.91
github/fork/deepanshu1422/fix-typo-in-comment
github/fork/haosdent/fix-typo
linux-next
v4.19.91
v4.19.90
v4.19.89
v4.19.88
v4.19.87
v4.19.86
v4.19.85
v4.19.84
v4.19.83
v4.19.82
v4.19.81
v4.19.80
v4.19.79
v4.19.78
v4.19.77
v4.19.76
v4.19.75
v4.19.74
v4.19.73
v4.19.72
v4.19.71
v4.19.70
v4.19.69
v4.19.68
v4.19.67
v4.19.66
v4.19.65
v4.19.64
v4.19.63
v4.19.62
v4.19.61
v4.19.60
v4.19.59
v4.19.58
v4.19.57
v4.19.56
v4.19.55
v4.19.54
v4.19.53
v4.19.52
v4.19.51
v4.19.50
v4.19.49
v4.19.48
v4.19.47
v4.19.46
v4.19.45
v4.19.44
v4.19.43
v4.19.42
v4.19.41
v4.19.40
v4.19.39
v4.19.38
v4.19.37
v4.19.36
v4.19.35
v4.19.34
v4.19.33
v4.19.32
v4.19.31
v4.19.30
v4.19.29
v4.19.28
v4.19.27
v4.19.26
v4.19.25
v4.19.24
v4.19.23
v4.19.22
v4.19.21
v4.19.20
v4.19.19
v4.19.18
v4.19.17
v4.19.16
v4.19.15
v4.19.14
v4.19.13
v4.19.12
v4.19.11
v4.19.10
v4.19.9
v4.19.8
v4.19.7
v4.19.6
v4.19.5
v4.19.4
v4.19.3
v4.19.2
v4.19.1
v4.19
v4.19-rc8
v4.19-rc7
v4.19-rc6
v4.19-rc5
v4.19-rc4
v4.19-rc3
v4.19-rc2
v4.19-rc1
ck-release-21
ck-release-20
ck-release-19.2
ck-release-19.1
ck-release-19
ck-release-18
ck-release-17.2
ck-release-17.1
ck-release-17
ck-release-16
ck-release-15.1
ck-release-15
ck-release-14
ck-release-13.2
ck-release-13
ck-release-12
ck-release-11
ck-release-10
ck-release-9
ck-release-7
alk-release-15
alk-release-14
alk-release-13.2
alk-release-13
alk-release-12
alk-release-11
alk-release-10
alk-release-9
alk-release-7
无相关合并请求
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
12 deletion
+21
-12
drivers/net/fec_8xx/Kconfig
drivers/net/fec_8xx/Kconfig
+1
-1
drivers/net/wireless/ipw2100.c
drivers/net/wireless/ipw2100.c
+18
-11
drivers/net/wireless/ipw2100.h
drivers/net/wireless/ipw2100.h
+2
-0
未找到文件。
drivers/net/fec_8xx/Kconfig
浏览文件 @
51c83a94
config FEC_8XX
tristate "Motorola 8xx FEC driver"
depends on NET_ETHERNET &&
FEC
depends on NET_ETHERNET &&
8xx
select MII
config FEC_8XX_GENERIC_PHY
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/ipw2100.c
浏览文件 @
51c83a94
...
...
@@ -6344,7 +6344,8 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
dev
->
ethtool_ops
=
&
ipw2100_ethtool_ops
;
dev
->
tx_timeout
=
ipw2100_tx_timeout
;
dev
->
wireless_handlers
=
&
ipw2100_wx_handler_def
;
dev
->
get_wireless_stats
=
ipw2100_wx_wireless_stats
;
priv
->
wireless_data
.
ieee80211
=
priv
->
ieee
;
dev
->
wireless_data
=
&
priv
->
wireless_data
;
dev
->
set_mac_address
=
ipw2100_set_address
;
dev
->
watchdog_timeo
=
3
*
HZ
;
dev
->
irq
=
0
;
...
...
@@ -7178,6 +7179,11 @@ static int ipw2100_wx_get_range(struct net_device *dev,
}
range
->
num_frequency
=
val
;
/* Event capability (kernel + driver) */
range
->
event_capa
[
0
]
=
(
IW_EVENT_CAPA_K_0
|
IW_EVENT_CAPA_MASK
(
SIOCGIWAP
));
range
->
event_capa
[
1
]
=
IW_EVENT_CAPA_K_1
;
IPW_DEBUG_WX
(
"GET Range
\n
"
);
return
0
;
...
...
@@ -8446,16 +8452,6 @@ static iw_handler ipw2100_private_handler[] = {
#endif
/* CONFIG_IPW2100_MONITOR */
};
static
struct
iw_handler_def
ipw2100_wx_handler_def
=
{
.
standard
=
ipw2100_wx_handlers
,
.
num_standard
=
sizeof
(
ipw2100_wx_handlers
)
/
sizeof
(
iw_handler
),
.
num_private
=
sizeof
(
ipw2100_private_handler
)
/
sizeof
(
iw_handler
),
.
num_private_args
=
sizeof
(
ipw2100_private_args
)
/
sizeof
(
struct
iw_priv_args
),
.
private
=
(
iw_handler
*
)
ipw2100_private_handler
,
.
private_args
=
(
struct
iw_priv_args
*
)
ipw2100_private_args
,
};
/*
* Get wireless statistics.
* Called by /proc/net/wireless
...
...
@@ -8597,6 +8593,17 @@ static struct iw_statistics *ipw2100_wx_wireless_stats(struct net_device *dev)
return
(
struct
iw_statistics
*
)
NULL
;
}
static
struct
iw_handler_def
ipw2100_wx_handler_def
=
{
.
standard
=
ipw2100_wx_handlers
,
.
num_standard
=
sizeof
(
ipw2100_wx_handlers
)
/
sizeof
(
iw_handler
),
.
num_private
=
sizeof
(
ipw2100_private_handler
)
/
sizeof
(
iw_handler
),
.
num_private_args
=
sizeof
(
ipw2100_private_args
)
/
sizeof
(
struct
iw_priv_args
),
.
private
=
(
iw_handler
*
)
ipw2100_private_handler
,
.
private_args
=
(
struct
iw_priv_args
*
)
ipw2100_private_args
,
.
get_wireless_stats
=
ipw2100_wx_wireless_stats
,
};
static
void
ipw2100_wx_event_work
(
struct
ipw2100_priv
*
priv
)
{
union
iwreq_data
wrqu
;
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/ipw2100.h
浏览文件 @
51c83a94
...
...
@@ -571,6 +571,8 @@ struct ipw2100_priv {
struct
net_device
*
net_dev
;
struct
iw_statistics
wstats
;
struct
iw_public_data
wireless_data
;
struct
tasklet_struct
irq_tasklet
;
struct
workqueue_struct
*
workqueue
;
...
...
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部