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
10e9aaa7
Commit
10e9aaa7
authored
Mar 06, 2002
by
François Romieu
Committed by
Jeff Garzik
Mar 06, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WAN drivers update 2/5:
s/SIOCDEVICE/SIOCWANDEV/
parent
a36167db
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
15 deletions
+15
-15
drivers/net/wan/c101.c
drivers/net/wan/c101.c
+1
-1
drivers/net/wan/dscc4.c
drivers/net/wan/dscc4.c
+1
-1
drivers/net/wan/farsync.c
drivers/net/wan/farsync.c
+1
-1
drivers/net/wan/hdlc_generic.c
drivers/net/wan/hdlc_generic.c
+1
-1
drivers/net/wan/hdlc_raw.c
drivers/net/wan/hdlc_raw.c
+4
-4
drivers/net/wan/n2.c
drivers/net/wan/n2.c
+1
-1
include/linux/hdlc.h
include/linux/hdlc.h
+3
-3
include/linux/sockios.h
include/linux/sockios.h
+1
-1
net/core/dev.c
net/core/dev.c
+2
-2
No files found.
drivers/net/wan/c101.c
View file @
10e9aaa7
...
...
@@ -189,7 +189,7 @@ static int c101_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return
0
;
}
#endif
if
(
cmd
!=
SIOC
DEVICE
)
if
(
cmd
!=
SIOC
WANDEV
)
return
hdlc_ioctl
(
dev
,
ifr
,
cmd
);
switch
(
ifr
->
ifr_settings
.
type
)
{
...
...
drivers/net/wan/dscc4.c
View file @
10e9aaa7
...
...
@@ -1073,7 +1073,7 @@ static int dscc4_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if
(
dev
->
flags
&
IFF_UP
)
return
-
EBUSY
;
if
(
cmd
!=
SIOC
DEVICE
)
if
(
cmd
!=
SIOC
WANDEV
)
return
-
EOPNOTSUPP
;
switch
(
ifr
->
ifr_settings
.
type
)
{
...
...
drivers/net/wan/farsync.c
View file @
10e9aaa7
...
...
@@ -1240,7 +1240,7 @@ fst_ioctl ( struct net_device *dev, struct ifreq *ifr, int cmd )
return
set_conf_from_info
(
card
,
port
,
&
info
);
case
SIOC
DEVICE
:
case
SIOC
WANDEV
:
switch
(
ifr
->
ifr_settings
.
type
)
{
case
IF_GET_IFACE
:
...
...
drivers/net/wan/hdlc_generic.c
View file @
10e9aaa7
...
...
@@ -72,7 +72,7 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
hdlc_device
*
hdlc
=
dev_to_hdlc
(
dev
);
unsigned
int
proto
;
if
(
cmd
!=
SIOC
DEVICE
)
if
(
cmd
!=
SIOC
WANDEV
)
return
-
EINVAL
;
switch
(
ifr
->
ifr_settings
.
type
)
{
...
...
drivers/net/wan/hdlc_raw.c
View file @
10e9aaa7
...
...
@@ -49,7 +49,7 @@ int hdlc_raw_ioctl(hdlc_device *hdlc, struct ifreq *ifr)
if
(
ifr
->
ifr_settings
.
data_length
<
size
)
return
-
ENOMEM
;
/* buffer too small */
if
(
copy_to_user
(
ifr
->
ifr_settings
.
data
,
&
hdlc
->
state
.
hdlc
.
settings
,
size
))
&
hdlc
->
state
.
raw_
hdlc
.
settings
,
size
))
return
-
EFAULT
;
ifr
->
ifr_settings
.
data_length
=
size
;
return
0
;
...
...
@@ -64,15 +64,15 @@ int hdlc_raw_ioctl(hdlc_device *hdlc, struct ifreq *ifr)
if
(
ifr
->
ifr_settings
.
data_length
!=
size
)
return
-
ENOMEM
;
/* incorrect data length */
if
(
copy_from_user
(
&
hdlc
->
state
.
hdlc
.
settings
,
if
(
copy_from_user
(
&
hdlc
->
state
.
raw_
hdlc
.
settings
,
ifr
->
ifr_settings
.
data
,
size
))
return
-
EFAULT
;
/* FIXME - put sanity checks here */
hdlc_detach
(
hdlc
);
result
=
hdlc
->
attach
(
hdlc
,
hdlc
->
state
.
hdlc
.
settings
.
encoding
,
hdlc
->
state
.
hdlc
.
settings
.
parity
);
result
=
hdlc
->
attach
(
hdlc
,
hdlc
->
state
.
raw_
hdlc
.
settings
.
encoding
,
hdlc
->
state
.
raw_
hdlc
.
settings
.
parity
);
if
(
result
)
{
hdlc
->
proto
=
-
1
;
return
result
;
...
...
drivers/net/wan/n2.c
View file @
10e9aaa7
...
...
@@ -260,7 +260,7 @@ static int n2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return
0
;
}
#endif
if
(
cmd
!=
SIOC
DEVICE
)
if
(
cmd
!=
SIOC
WANDEV
)
return
hdlc_ioctl
(
dev
,
ifr
,
cmd
);
switch
(
ifr
->
ifr_settings
.
type
)
{
...
...
include/linux/hdlc.h
View file @
10e9aaa7
...
...
@@ -53,7 +53,7 @@ typedef struct {
typedef
struct
{
unsigned
short
encoding
;
unsigned
short
parity
;
}
hdlc_proto
;
}
raw_
hdlc_proto
;
#define LMI_DEFAULT 0
/* Default (current) setting */
...
...
@@ -251,8 +251,8 @@ typedef struct hdlc_device_struct {
}
cisco
;
struct
{
hdlc_proto
settings
;
}
hdlc
;
raw_
hdlc_proto
settings
;
}
raw_
hdlc
;
struct
{
struct
ppp_device
pppdev
;
...
...
include/linux/sockios.h
View file @
10e9aaa7
...
...
@@ -81,7 +81,7 @@
#define SIOCGMIIREG 0x8948
/* Read MII PHY register. */
#define SIOCSMIIREG 0x8949
/* Write MII PHY register. */
#define SIOC
DEVICE
0x894A
/* get/set netdev parameters */
#define SIOC
WANDEV
0x894A
/* get/set netdev parameters */
/* ARP cache control calls. */
/* 0x8950 - 0x8952 * obsolete calls, don't re-use */
...
...
net/core/dev.c
View file @
10e9aaa7
...
...
@@ -2111,7 +2111,7 @@ static int dev_ifsioc(struct ifreq *ifr, unsigned int cmd)
cmd
==
SIOCGMIIPHY
||
cmd
==
SIOCGMIIREG
||
cmd
==
SIOCSMIIREG
||
cmd
==
SIOC
DEVICE
)
{
cmd
==
SIOC
WANDEV
)
{
if
(
dev
->
do_ioctl
)
{
if
(
!
netif_device_present
(
dev
))
return
-
ENODEV
;
...
...
@@ -2277,7 +2277,7 @@ int dev_ioctl(unsigned int cmd, void *arg)
*/
default:
if
(
cmd
==
SIOC
DEVICE
||
if
(
cmd
==
SIOC
WANDEV
||
(
cmd
>=
SIOCDEVPRIVATE
&&
cmd
<=
SIOCDEVPRIVATE
+
15
))
{
dev_load
(
ifr
.
ifr_name
);
...
...
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