Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
raspberrypi-kernel
提交
06802a81
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看板
提交
06802a81
编写于
16年前
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of ../net-2.6/
Conflicts: net/ipv6/ndisc.c
上级
9bd512f6
8f3ea33a
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
43 addition
and
57 deletion
+43
-57
drivers/connector/cn_queue.c
drivers/connector/cn_queue.c
+1
-1
drivers/net/bnx2x.c
drivers/net/bnx2x.c
+2
-34
drivers/net/sungem.c
drivers/net/sungem.c
+1
-1
include/net/sctp/sctp.h
include/net/sctp/sctp.h
+1
-1
net/9p/trans_fd.c
net/9p/trans_fd.c
+0
-2
net/atm/clip.c
net/atm/clip.c
+16
-3
net/atm/lec.c
net/atm/lec.c
+4
-0
net/ipv4/fib_trie.c
net/ipv4/fib_trie.c
+5
-2
net/ipv4/ip_fragment.c
net/ipv4/ip_fragment.c
+1
-1
net/ipv4/tcp.c
net/ipv4/tcp.c
+2
-2
net/sched/sch_htb.c
net/sched/sch_htb.c
+7
-6
net/socket.c
net/socket.c
+3
-4
未找到文件。
drivers/connector/cn_queue.c
浏览文件 @
06802a81
...
...
@@ -146,7 +146,7 @@ struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *nls)
dev
->
nls
=
nls
;
dev
->
cn_queue
=
create_workqueue
(
dev
->
name
);
dev
->
cn_queue
=
create_
singlethread_
workqueue
(
dev
->
name
);
if
(
!
dev
->
cn_queue
)
{
kfree
(
dev
);
return
NULL
;
...
...
This diff is collapsed.
Click to expand it.
drivers/net/bnx2x.c
浏览文件 @
06802a81
...
...
@@ -63,8 +63,8 @@
#include "bnx2x.h"
#include "bnx2x_init.h"
#define DRV_MODULE_VERSION "1.4
0.22
"
#define DRV_MODULE_RELDATE "200
7/11/27
"
#define DRV_MODULE_VERSION "1.4
2.3
"
#define DRV_MODULE_RELDATE "200
8/3/9
"
#define BNX2X_BC_VER 0x040200
/* Time in jiffies before concluding the transmitter is hung. */
...
...
@@ -8008,38 +8008,6 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
cmd
->
duplex
,
cmd
->
port
,
cmd
->
phy_address
,
cmd
->
transceiver
,
cmd
->
autoneg
,
cmd
->
maxtxpkt
,
cmd
->
maxrxpkt
);
switch
(
cmd
->
port
)
{
case
PORT_TP
:
if
(
!
(
bp
->
supported
&
SUPPORTED_TP
))
{
DP
(
NETIF_MSG_LINK
,
"TP not supported
\n
"
);
return
-
EINVAL
;
}
if
(
bp
->
phy_flags
&
PHY_XGXS_FLAG
)
{
bnx2x_link_reset
(
bp
);
bnx2x_link_settings_supported
(
bp
,
SWITCH_CFG_1G
);
bnx2x_phy_deassert
(
bp
);
}
break
;
case
PORT_FIBRE
:
if
(
!
(
bp
->
supported
&
SUPPORTED_FIBRE
))
{
DP
(
NETIF_MSG_LINK
,
"FIBRE not supported
\n
"
);
return
-
EINVAL
;
}
if
(
!
(
bp
->
phy_flags
&
PHY_XGXS_FLAG
))
{
bnx2x_link_reset
(
bp
);
bnx2x_link_settings_supported
(
bp
,
SWITCH_CFG_10G
);
bnx2x_phy_deassert
(
bp
);
}
break
;
default:
DP
(
NETIF_MSG_LINK
,
"Unknown port type
\n
"
);
return
-
EINVAL
;
}
if
(
cmd
->
autoneg
==
AUTONEG_ENABLE
)
{
if
(
!
(
bp
->
supported
&
SUPPORTED_Autoneg
))
{
DP
(
NETIF_MSG_LINK
,
"Aotoneg not supported
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
drivers/net/sungem.c
浏览文件 @
06802a81
...
...
@@ -912,7 +912,7 @@ static int gem_poll(struct napi_struct *napi, int budget)
* rx ring - must call napi_disable(), which
* schedule_timeout()'s if polling is already disabled.
*/
work_done
+=
gem_rx
(
gp
,
budget
);
work_done
+=
gem_rx
(
gp
,
budget
-
work_done
);
if
(
work_done
>=
budget
)
return
work_done
;
...
...
This diff is collapsed.
Click to expand it.
include/net/sctp/sctp.h
浏览文件 @
06802a81
...
...
@@ -384,7 +384,7 @@ void sctp_v6_del_protocol(void);
#else
/* #ifdef defined(CONFIG_IPV6) */
static
inline
void
sctp_v6_pf_init
(
void
)
{
return
0
;
}
static
inline
void
sctp_v6_pf_init
(
void
)
{
return
;
}
static
inline
void
sctp_v6_pf_exit
(
void
)
{
return
;
}
static
inline
int
sctp_v6_protosw_init
(
void
)
{
return
0
;
}
static
inline
void
sctp_v6_protosw_exit
(
void
)
{
return
;
}
...
...
This diff is collapsed.
Click to expand it.
net/9p/trans_fd.c
浏览文件 @
06802a81
...
...
@@ -861,7 +861,6 @@ static void p9_mux_free_request(struct p9_conn *m, struct p9_req *req)
static
void
p9_mux_flush_cb
(
struct
p9_req
*
freq
,
void
*
a
)
{
p9_conn_req_callback
cb
;
int
tag
;
struct
p9_conn
*
m
;
struct
p9_req
*
req
,
*
rreq
,
*
rptr
;
...
...
@@ -872,7 +871,6 @@ static void p9_mux_flush_cb(struct p9_req *freq, void *a)
freq
->
tcall
->
params
.
tflush
.
oldtag
);
spin_lock
(
&
m
->
lock
);
cb
=
NULL
;
tag
=
freq
->
tcall
->
params
.
tflush
.
oldtag
;
req
=
NULL
;
list_for_each_entry_safe
(
rreq
,
rptr
,
&
m
->
req_list
,
req_list
)
{
...
...
This diff is collapsed.
Click to expand it.
net/atm/clip.c
浏览文件 @
06802a81
...
...
@@ -943,6 +943,8 @@ static const struct file_operations arp_seq_fops = {
};
#endif
static
void
atm_clip_exit_noproc
(
void
);
static
int
__init
atm_clip_init
(
void
)
{
neigh_table_init_no_netlink
(
&
clip_tbl
);
...
...
@@ -959,18 +961,22 @@ static int __init atm_clip_init(void)
struct
proc_dir_entry
*
p
;
p
=
proc_create
(
"arp"
,
S_IRUGO
,
atm_proc_root
,
&
arp_seq_fops
);
if
(
!
p
)
{
printk
(
KERN_ERR
"Unable to initialize "
"/proc/net/atm/arp
\n
"
);
atm_clip_exit_noproc
();
return
-
ENOMEM
;
}
}
#endif
return
0
;
}
static
void
__exit
atm_clip_exit
(
void
)
static
void
atm_clip_exit_noproc
(
void
)
{
struct
net_device
*
dev
,
*
next
;
remove_proc_entry
(
"arp"
,
atm_proc_root
);
unregister_inetaddr_notifier
(
&
clip_inet_notifier
);
unregister_netdevice_notifier
(
&
clip_dev_notifier
);
...
...
@@ -1001,6 +1007,13 @@ static void __exit atm_clip_exit(void)
clip_tbl_hook
=
NULL
;
}
static
void
__exit
atm_clip_exit
(
void
)
{
remove_proc_entry
(
"arp"
,
atm_proc_root
);
atm_clip_exit_noproc
();
}
module_init
(
atm_clip_init
);
module_exit
(
atm_clip_exit
);
MODULE_AUTHOR
(
"Werner Almesberger"
);
...
...
This diff is collapsed.
Click to expand it.
net/atm/lec.c
浏览文件 @
06802a81
...
...
@@ -1225,6 +1225,10 @@ static int __init lane_module_init(void)
struct
proc_dir_entry
*
p
;
p
=
proc_create
(
"lec"
,
S_IRUGO
,
atm_proc_root
,
&
lec_seq_fops
);
if
(
!
p
)
{
printk
(
KERN_ERR
"Unable to initialize /proc/net/atm/lec
\n
"
);
return
-
ENOMEM
;
}
#endif
register_atm_ioctl
(
&
lane_ioctl_ops
);
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/fib_trie.c
浏览文件 @
06802a81
...
...
@@ -177,10 +177,13 @@ static inline struct tnode *node_parent_rcu(struct node *node)
return
rcu_dereference
(
ret
);
}
/* Same as rcu_assign_pointer
* but that macro() assumes that value is a pointer.
*/
static
inline
void
node_set_parent
(
struct
node
*
node
,
struct
tnode
*
ptr
)
{
rcu_assign_pointer
(
node
->
parent
,
(
unsigned
long
)
ptr
|
NODE_TYPE
(
node
)
);
smp_wmb
();
node
->
parent
=
(
unsigned
long
)
ptr
|
NODE_TYPE
(
node
);
}
static
inline
struct
node
*
tnode_get_child
(
struct
tnode
*
tn
,
unsigned
int
i
)
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/ip_fragment.c
浏览文件 @
06802a81
...
...
@@ -568,7 +568,7 @@ int ip_defrag(struct sk_buff *skb, u32 user)
IP_INC_STATS_BH
(
IPSTATS_MIB_REASMREQDS
);
net
=
skb
->
dev
->
nd_net
;
net
=
skb
->
dev
?
skb
->
dev
->
nd_net
:
skb
->
dst
->
dev
->
nd_net
;
/* Start by cleaning up the memory. */
if
(
atomic_read
(
&
net
->
ipv4
.
frags
.
mem
)
>
net
->
ipv4
.
frags
.
high_thresh
)
ip_evictor
(
net
);
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/tcp.c
浏览文件 @
06802a81
...
...
@@ -735,7 +735,7 @@ static ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffse
if
(
!
(
psize
-=
copy
))
goto
out
;
if
(
skb
->
len
<
mss_now
||
(
flags
&
MSG_OOB
))
if
(
skb
->
len
<
size_goal
||
(
flags
&
MSG_OOB
))
continue
;
if
(
forced_push
(
tp
))
{
...
...
@@ -981,7 +981,7 @@ int tcp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
if
((
seglen
-=
copy
)
==
0
&&
iovlen
==
0
)
goto
out
;
if
(
skb
->
len
<
mss_now
||
(
flags
&
MSG_OOB
))
if
(
skb
->
len
<
size_goal
||
(
flags
&
MSG_OOB
))
continue
;
if
(
forced_push
(
tp
))
{
...
...
This diff is collapsed.
Click to expand it.
net/sched/sch_htb.c
浏览文件 @
06802a81
...
...
@@ -711,9 +711,11 @@ static void htb_charge_class(struct htb_sched *q, struct htb_class *cl,
*/
static
psched_time_t
htb_do_events
(
struct
htb_sched
*
q
,
int
level
)
{
int
i
;
for
(
i
=
0
;
i
<
500
;
i
++
)
{
/* don't run for longer than 2 jiffies; 2 is used instead of
1 to simplify things when jiffy is going to be incremented
too soon */
unsigned
long
stop_at
=
jiffies
+
2
;
while
(
time_before
(
jiffies
,
stop_at
))
{
struct
htb_class
*
cl
;
long
diff
;
struct
rb_node
*
p
=
rb_first
(
&
q
->
wait_pq
[
level
]);
...
...
@@ -731,9 +733,8 @@ static psched_time_t htb_do_events(struct htb_sched *q, int level)
if
(
cl
->
cmode
!=
HTB_CAN_SEND
)
htb_add_to_wait_tree
(
q
,
cl
,
diff
);
}
if
(
net_ratelimit
())
printk
(
KERN_WARNING
"htb: too many events !
\n
"
);
return
q
->
now
+
PSCHED_TICKS_PER_SEC
/
10
;
/* too much load - let's continue on next jiffie */
return
q
->
now
+
PSCHED_TICKS_PER_SEC
/
HZ
;
}
/* Returns class->node+prio from id-tree where classe's id is >= id. NULL
...
...
This diff is collapsed.
Click to expand it.
net/socket.c
浏览文件 @
06802a81
...
...
@@ -909,11 +909,10 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
if
(
!
dlci_ioctl_hook
)
request_module
(
"dlci"
);
if
(
dlci_ioctl_hook
)
{
mutex_lock
(
&
dlci_ioctl_mutex
);
mutex_lock
(
&
dlci_ioctl_mutex
);
if
(
dlci_ioctl_hook
)
err
=
dlci_ioctl_hook
(
cmd
,
argp
);
mutex_unlock
(
&
dlci_ioctl_mutex
);
}
mutex_unlock
(
&
dlci_ioctl_mutex
);
break
;
default:
err
=
sock
->
ops
->
ioctl
(
sock
,
cmd
,
arg
);
...
...
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
新手
引导
客服
返回
顶部