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
dccb8861
Commit
dccb8861
authored
Jun 14, 2003
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents
aae1760a
39ba9a4b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
64 deletions
+8
-64
drivers/net/Space.c
drivers/net/Space.c
+0
-34
drivers/net/fc/iph5526.c
drivers/net/fc/iph5526.c
+5
-17
net/socket.c
net/socket.c
+3
-13
No files found.
drivers/net/Space.c
View file @
dccb8861
...
@@ -398,24 +398,6 @@ static int __init ethif_probe(struct net_device *dev)
...
@@ -398,24 +398,6 @@ static int __init ethif_probe(struct net_device *dev)
return
-
ENODEV
;
return
-
ENODEV
;
}
}
#ifdef CONFIG_NET_FC
static
int
fcif_probe
(
struct
net_device
*
dev
)
{
if
(
dev
->
base_addr
==
-
1
)
return
1
;
if
(
1
#ifdef CONFIG_IPHASE5526
&&
iph5526_probe
(
dev
)
#endif
&&
1
)
{
return
1
;
/* -ENODEV or -EAGAIN would be more accurate. */
}
return
0
;
}
#endif
/* CONFIG_NET_FC */
#ifdef CONFIG_ETHERTAP
#ifdef CONFIG_ETHERTAP
static
struct
net_device
tap0_dev
=
{
static
struct
net_device
tap0_dev
=
{
.
name
=
"tap0"
,
.
name
=
"tap0"
,
...
@@ -589,22 +571,6 @@ static struct net_device tr0_dev = {
...
@@ -589,22 +571,6 @@ static struct net_device tr0_dev = {
#endif
#endif
#ifdef CONFIG_NET_FC
static
struct
net_device
fc1_dev
=
{
.
name
=
"fc1"
,
.
next
=
NEXT_DEV
,
.
init
=
fcif_probe
};
static
struct
net_device
fc0_dev
=
{
.
name
=
"fc0"
,
.
next
=
&
fc1_dev
,
.
init
=
fcif_probe
};
#undef NEXT_DEV
#define NEXT_DEV (&fc0_dev)
#endif
#ifdef CONFIG_SBNI
#ifdef CONFIG_SBNI
static
struct
net_device
sbni7_dev
=
{
static
struct
net_device
sbni7_dev
=
{
.
name
=
"sbni7"
,
.
name
=
"sbni7"
,
...
...
drivers/net/fc/iph5526.c
View file @
dccb8861
...
@@ -239,19 +239,7 @@ int __init iph5526_probe(struct net_device *dev)
...
@@ -239,19 +239,7 @@ int __init iph5526_probe(struct net_device *dev)
static
int
__init
iph5526_probe_pci
(
struct
net_device
*
dev
)
static
int
__init
iph5526_probe_pci
(
struct
net_device
*
dev
)
{
{
#ifdef MODULE
struct
fc_info
*
fi
=
(
struct
fc_info
*
)
dev
->
priv
;
struct
fc_info
*
fi
=
(
struct
fc_info
*
)
dev
->
priv
;
#else
struct
fc_info
*
fi
=
fc
[
count
];
static
int
count
;
int
err
;
if
(
!
fi
)
return
-
ENODEV
;
fc_setup
(
dev
);
count
++
;
#endif
fi
->
dev
=
dev
;
fi
->
dev
=
dev
;
dev
->
base_addr
=
fi
->
base_addr
;
dev
->
base_addr
=
fi
->
base_addr
;
dev
->
irq
=
fi
->
irq
;
dev
->
irq
=
fi
->
irq
;
...
@@ -4479,8 +4467,6 @@ static char buf[80];
...
@@ -4479,8 +4467,6 @@ static char buf[80];
return
buf
;
return
buf
;
}
}
#ifdef MODULE
#define NAMELEN 8
/* # of chars for storing dev->name */
#define NAMELEN 8
/* # of chars for storing dev->name */
static
struct
net_device
*
dev_fc
[
MAX_FC_CARDS
];
static
struct
net_device
*
dev_fc
[
MAX_FC_CARDS
];
...
@@ -4491,7 +4477,7 @@ static int bad; /* 0xbad = bad sig or no reset ack */
...
@@ -4491,7 +4477,7 @@ static int bad; /* 0xbad = bad sig or no reset ack */
static
int
scsi_registered
;
static
int
scsi_registered
;
int
init_module
(
void
)
static
int
__init
iph5526_init
(
void
)
{
{
int
i
=
0
;
int
i
=
0
;
...
@@ -4530,7 +4516,7 @@ int init_module(void)
...
@@ -4530,7 +4516,7 @@ int init_module(void)
return
0
;
return
0
;
}
}
void
cleanup_module
(
void
)
static
void
__exit
iph5526_exit
(
void
)
{
{
int
i
=
0
;
int
i
=
0
;
while
(
fc
[
i
]
!=
NULL
)
{
while
(
fc
[
i
]
!=
NULL
)
{
...
@@ -4549,7 +4535,9 @@ void cleanup_module(void)
...
@@ -4549,7 +4535,9 @@ void cleanup_module(void)
if
(
scsi_registered
==
TRUE
)
if
(
scsi_registered
==
TRUE
)
scsi_unregister_host
(
&
driver_template
);
scsi_unregister_host
(
&
driver_template
);
}
}
#endif
/* MODULE */
module_init
(
iph5526_init
);
module_exit
(
iph5526_exit
);
void
clean_up_memory
(
struct
fc_info
*
fi
)
void
clean_up_memory
(
struct
fc_info
*
fi
)
{
{
...
...
net/socket.c
View file @
dccb8861
...
@@ -79,10 +79,7 @@
...
@@ -79,10 +79,7 @@
#include <linux/mount.h>
#include <linux/mount.h>
#include <linux/security.h>
#include <linux/security.h>
#include <linux/compat.h>
#include <linux/compat.h>
#if defined(CONFIG_KMOD) && defined(CONFIG_NET)
#include <linux/kmod.h>
#include <linux/kmod.h>
#endif
#ifdef CONFIG_NET_RADIO
#ifdef CONFIG_NET_RADIO
#include <linux/wireless.h>
/* Note : will define WIRELESS_EXT */
#include <linux/wireless.h>
/* Note : will define WIRELESS_EXT */
...
@@ -770,11 +767,9 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
...
@@ -770,11 +767,9 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unlock_kernel
();
unlock_kernel
();
sock
=
SOCKET_I
(
inode
);
sock
=
SOCKET_I
(
inode
);
#ifdef CONFIG_NET
if
(
cmd
>=
SIOCDEVPRIVATE
&&
cmd
<=
(
SIOCDEVPRIVATE
+
15
))
{
if
(
cmd
>=
SIOCDEVPRIVATE
&&
cmd
<=
(
SIOCDEVPRIVATE
+
15
))
{
err
=
dev_ioctl
(
cmd
,
(
void
*
)
arg
);
err
=
dev_ioctl
(
cmd
,
(
void
*
)
arg
);
}
else
}
else
#endif
/* CONFIG_NET */
#ifdef WIRELESS_EXT
#ifdef WIRELESS_EXT
if
(
cmd
>=
SIOCIWFIRST
&&
cmd
<=
SIOCIWLAST
)
{
if
(
cmd
>=
SIOCIWFIRST
&&
cmd
<=
SIOCIWLAST
)
{
err
=
dev_ioctl
(
cmd
,
(
void
*
)
arg
);
err
=
dev_ioctl
(
cmd
,
(
void
*
)
arg
);
...
@@ -795,11 +790,8 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
...
@@ -795,11 +790,8 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
case
SIOCGIFBR
:
case
SIOCGIFBR
:
case
SIOCSIFBR
:
case
SIOCSIFBR
:
err
=
-
ENOPKG
;
err
=
-
ENOPKG
;
#ifdef CONFIG_KMOD
if
(
!
br_ioctl_hook
)
if
(
!
br_ioctl_hook
)
request_module
(
"bridge"
);
request_module
(
"bridge"
);
#endif
down
(
&
br_ioctl_mutex
);
down
(
&
br_ioctl_mutex
);
if
(
br_ioctl_hook
)
if
(
br_ioctl_hook
)
...
@@ -809,10 +801,9 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
...
@@ -809,10 +801,9 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
case
SIOCGIFVLAN
:
case
SIOCGIFVLAN
:
case
SIOCSIFVLAN
:
case
SIOCSIFVLAN
:
err
=
-
ENOPKG
;
err
=
-
ENOPKG
;
#ifdef CONFIG_KMOD
if
(
!
vlan_ioctl_hook
)
if
(
!
vlan_ioctl_hook
)
request_module
(
"8021q"
);
request_module
(
"8021q"
);
#endif
down
(
&
vlan_ioctl_mutex
);
down
(
&
vlan_ioctl_mutex
);
if
(
vlan_ioctl_hook
)
if
(
vlan_ioctl_hook
)
err
=
vlan_ioctl_hook
(
arg
);
err
=
vlan_ioctl_hook
(
arg
);
...
@@ -826,10 +817,9 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
...
@@ -826,10 +817,9 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
case
SIOCADDDLCI
:
case
SIOCADDDLCI
:
case
SIOCDELDLCI
:
case
SIOCDELDLCI
:
err
=
-
ENOPKG
;
err
=
-
ENOPKG
;
#ifdef CONFIG_KMOD
if
(
!
dlci_ioctl_hook
)
if
(
!
dlci_ioctl_hook
)
request_module
(
"dlci"
);
request_module
(
"dlci"
);
#endif
if
(
dlci_ioctl_hook
)
{
if
(
dlci_ioctl_hook
)
{
down
(
&
dlci_ioctl_mutex
);
down
(
&
dlci_ioctl_mutex
);
err
=
dlci_ioctl_hook
(
cmd
,
(
void
*
)
arg
);
err
=
dlci_ioctl_hook
(
cmd
,
(
void
*
)
arg
);
...
@@ -1021,7 +1011,7 @@ int sock_create(int family, int type, int protocol, struct socket **res)
...
@@ -1021,7 +1011,7 @@ int sock_create(int family, int type, int protocol, struct socket **res)
if
(
err
)
if
(
err
)
return
err
;
return
err
;
#if defined(CONFIG_KMOD)
&& defined(CONFIG_NET)
#if defined(CONFIG_KMOD)
/* Attempt to load a protocol module if the find failed.
/* Attempt to load a protocol module if the find failed.
*
*
* 12/09/1996 Marcin: But! this makes REALLY only sense, if the user
* 12/09/1996 Marcin: But! this makes REALLY only sense, if the user
...
...
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