Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
0d502d82
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
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看板
提交
0d502d82
编写于
8月 06, 2009
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
上级
09384dfc
a9dfac33
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
3 deletion
+33
-3
net/ieee802154/af_ieee802154.c
net/ieee802154/af_ieee802154.c
+5
-3
net/ieee802154/dgram.c
net/ieee802154/dgram.c
+14
-0
net/ieee802154/raw.c
net/ieee802154/raw.c
+14
-0
未找到文件。
net/ieee802154/af_ieee802154.c
浏览文件 @
0d502d82
...
...
@@ -136,7 +136,7 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg,
unsigned
int
cmd
)
{
struct
ifreq
ifr
;
int
ret
=
-
E
INVAL
;
int
ret
=
-
E
NOIOCTLCMD
;
struct
net_device
*
dev
;
if
(
copy_from_user
(
&
ifr
,
arg
,
sizeof
(
struct
ifreq
)))
...
...
@@ -146,8 +146,10 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg,
dev_load
(
sock_net
(
sk
),
ifr
.
ifr_name
);
dev
=
dev_get_by_name
(
sock_net
(
sk
),
ifr
.
ifr_name
);
if
(
dev
->
type
==
ARPHRD_IEEE802154
||
dev
->
type
==
ARPHRD_IEEE802154_PHY
)
if
((
dev
->
type
==
ARPHRD_IEEE802154
||
dev
->
type
==
ARPHRD_IEEE802154_PHY
)
&&
dev
->
netdev_ops
->
ndo_do_ioctl
)
ret
=
dev
->
netdev_ops
->
ndo_do_ioctl
(
dev
,
&
ifr
,
cmd
);
if
(
!
ret
&&
copy_to_user
(
arg
,
&
ifr
,
sizeof
(
struct
ifreq
)))
...
...
net/ieee802154/dgram.c
浏览文件 @
0d502d82
...
...
@@ -377,6 +377,18 @@ int ieee802154_dgram_deliver(struct net_device *dev, struct sk_buff *skb)
return
ret
;
}
static
int
dgram_getsockopt
(
struct
sock
*
sk
,
int
level
,
int
optname
,
char
__user
*
optval
,
int
__user
*
optlen
)
{
return
-
EOPNOTSUPP
;
}
static
int
dgram_setsockopt
(
struct
sock
*
sk
,
int
level
,
int
optname
,
char
__user
*
optval
,
int
__user
optlen
)
{
return
-
EOPNOTSUPP
;
}
struct
proto
ieee802154_dgram_prot
=
{
.
name
=
"IEEE-802.15.4-MAC"
,
.
owner
=
THIS_MODULE
,
...
...
@@ -391,5 +403,7 @@ struct proto ieee802154_dgram_prot = {
.
connect
=
dgram_connect
,
.
disconnect
=
dgram_disconnect
,
.
ioctl
=
dgram_ioctl
,
.
getsockopt
=
dgram_getsockopt
,
.
setsockopt
=
dgram_setsockopt
,
};
net/ieee802154/raw.c
浏览文件 @
0d502d82
...
...
@@ -238,6 +238,18 @@ void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb)
read_unlock
(
&
raw_lock
);
}
static
int
raw_getsockopt
(
struct
sock
*
sk
,
int
level
,
int
optname
,
char
__user
*
optval
,
int
__user
*
optlen
)
{
return
-
EOPNOTSUPP
;
}
static
int
raw_setsockopt
(
struct
sock
*
sk
,
int
level
,
int
optname
,
char
__user
*
optval
,
int
__user
optlen
)
{
return
-
EOPNOTSUPP
;
}
struct
proto
ieee802154_raw_prot
=
{
.
name
=
"IEEE-802.15.4-RAW"
,
.
owner
=
THIS_MODULE
,
...
...
@@ -250,5 +262,7 @@ struct proto ieee802154_raw_prot = {
.
unhash
=
raw_unhash
,
.
connect
=
raw_connect
,
.
disconnect
=
raw_disconnect
,
.
getsockopt
=
raw_getsockopt
,
.
setsockopt
=
raw_setsockopt
,
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录