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
0f0ada4d
Commit
0f0ada4d
authored
Oct 11, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/net-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
parents
f8f3d12d
a968a3a5
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6 additions
and
7 deletions
+6
-7
drivers/char/pcmcia/synclink_cs.c
drivers/char/pcmcia/synclink_cs.c
+1
-1
drivers/char/synclink.c
drivers/char/synclink.c
+1
-1
drivers/char/synclinkmp.c
drivers/char/synclinkmp.c
+1
-1
drivers/net/wan/hostess_sv11.c
drivers/net/wan/hostess_sv11.c
+1
-1
net/atm/clip.c
net/atm/clip.c
+0
-2
net/ipv4/ip_output.c
net/ipv4/ip_output.c
+1
-0
net/ipx/ipx_proc.c
net/ipx/ipx_proc.c
+1
-1
No files found.
drivers/char/pcmcia/synclink_cs.c
View file @
0f0ada4d
...
...
@@ -4232,7 +4232,7 @@ void mgslpc_sppp_init(MGSLPC_INFO *info)
d
->
tx_timeout
=
mgslpc_sppp_tx_timeout
;
d
->
watchdog_timeo
=
10
*
HZ
;
if
(
register_netdev
(
d
)
==
-
1
)
{
if
(
register_netdev
(
d
))
{
printk
(
KERN_WARNING
"%s: register_netdev failed.
\n
"
,
d
->
name
);
sppp_detach
(
info
->
netdev
);
return
;
...
...
drivers/char/synclink.c
View file @
0f0ada4d
...
...
@@ -7847,7 +7847,7 @@ void mgsl_sppp_init(struct mgsl_struct *info)
d
->
tx_timeout
=
mgsl_sppp_tx_timeout
;
d
->
watchdog_timeo
=
10
*
HZ
;
if
(
register_netdev
(
d
)
==
-
1
)
{
if
(
register_netdev
(
d
))
{
printk
(
KERN_WARNING
"%s: register_netdev failed.
\n
"
,
d
->
name
);
sppp_detach
(
info
->
netdev
);
return
;
...
...
drivers/char/synclinkmp.c
View file @
0f0ada4d
...
...
@@ -1653,7 +1653,7 @@ static void sppp_init(SLMP_INFO *info)
d
->
tx_timeout
=
sppp_cb_tx_timeout
;
d
->
watchdog_timeo
=
10
*
HZ
;
if
(
register_netdev
(
d
)
==
-
1
)
{
if
(
register_netdev
(
d
))
{
printk
(
KERN_WARNING
"%s: register_netdev failed.
\n
"
,
d
->
name
);
sppp_detach
(
info
->
netdev
);
return
;
...
...
drivers/net/wan/hostess_sv11.c
View file @
0f0ada4d
...
...
@@ -337,7 +337,7 @@ static struct sv11_device *sv11_init(int iobase, int irq)
d
->
neigh_setup
=
hostess_neigh_setup_dev
;
d
->
set_mac_address
=
NULL
;
if
(
register_netdev
(
d
)
==-
1
)
if
(
register_netdev
(
d
))
{
printk
(
KERN_ERR
"%s: unable to register device.
\n
"
,
d
->
name
);
...
...
net/atm/clip.c
View file @
0f0ada4d
...
...
@@ -24,10 +24,8 @@
#include <linux/if.h>
/* for IFF_UP */
#include <linux/inetdevice.h>
#include <linux/bitops.h>
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#endif
#include <net/route.h>
/* for struct rtable and routing */
#include <net/icmp.h>
/* icmp_send */
#include <asm/param.h>
/* for HZ */
...
...
net/ipv4/ip_output.c
View file @
0f0ada4d
...
...
@@ -412,6 +412,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
#endif
#ifdef CONFIG_NETFILTER
to
->
nfmark
=
from
->
nfmark
;
to
->
nfcache
=
from
->
nfcache
;
/* Connection association is same as pre-frag packet */
to
->
nfct
=
from
->
nfct
;
nf_conntrack_get
(
to
->
nfct
);
...
...
net/ipx/ipx_proc.c
View file @
0f0ada4d
...
...
@@ -5,8 +5,8 @@
*/
#include <linux/config.h>
#ifdef CONFIG_PROC_FS
#include <linux/init.h>
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#include <linux/spinlock.h>
#include <linux/seq_file.h>
...
...
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