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
nexedi
linux
Commits
b88af452
Commit
b88af452
authored
Mar 12, 2004
by
Randy Dunlap
Committed by
Jeff Garzik
Mar 12, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] use netdev_priv() in net/wan drivers
parent
4cb79fb4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
62 additions
and
62 deletions
+62
-62
drivers/net/wan/comx-hw-locomx.c
drivers/net/wan/comx-hw-locomx.c
+11
-11
drivers/net/wan/comx-hw-munich.c
drivers/net/wan/comx-hw-munich.c
+16
-16
drivers/net/wan/comx.c
drivers/net/wan/comx.c
+20
-20
drivers/net/wan/cosa.c
drivers/net/wan/cosa.c
+10
-10
drivers/net/wan/lapbether.c
drivers/net/wan/lapbether.c
+5
-5
No files found.
drivers/net/wan/comx-hw-locomx.c
View file @
b88af452
...
...
@@ -77,7 +77,7 @@ struct locomx_data {
static
int
LOCOMX_txe
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
locomx_data
*
hw
=
ch
->
HW_privdata
;
return
(
!
hw
->
board
.
chanA
.
tx_next_skb
);
...
...
@@ -86,8 +86,8 @@ static int LOCOMX_txe(struct net_device *dev)
static
void
locomx_rx
(
struct
z8530_channel
*
c
,
struct
sk_buff
*
skb
)
{
struct
net_device
*
dev
=
c
->
netdevice
;
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
net_device
*
dev
=
c
->
netdevice
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
if
(
ch
->
debug_flags
&
DEBUG_HW_RX
)
{
comx_debug_skb
(
dev
,
skb
,
"locomx_rx receiving"
);
...
...
@@ -97,7 +97,7 @@ static void locomx_rx(struct z8530_channel *c, struct sk_buff *skb)
static
int
LOCOMX_send_packet
(
struct
net_device
*
dev
,
struct
sk_buff
*
skb
)
{
struct
comx_channel
*
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
locomx_data
*
hw
=
ch
->
HW_privdata
;
if
(
ch
->
debug_flags
&
DEBUG_HW_TX
)
{
...
...
@@ -126,9 +126,9 @@ static int LOCOMX_send_packet(struct net_device *dev, struct sk_buff *skb)
static
void
locomx_status_timerfun
(
unsigned
long
d
)
{
struct
net_device
*
dev
=
(
struct
net_device
*
)
d
;
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
locomx_data
*
hw
=
ch
->
HW_privdata
;
struct
net_device
*
dev
=
(
struct
net_device
*
)
d
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
locomx_data
*
hw
=
ch
->
HW_privdata
;
if
(
!
(
ch
->
line_status
&
LINE_UP
)
&&
(
hw
->
board
.
chanA
.
status
&
CTS
))
{
...
...
@@ -144,7 +144,7 @@ static void locomx_status_timerfun(unsigned long d)
static
int
LOCOMX_open
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
locomx_data
*
hw
=
ch
->
HW_privdata
;
struct
proc_dir_entry
*
procfile
=
ch
->
procdir
->
subdir
;
unsigned
long
flags
;
...
...
@@ -256,7 +256,7 @@ static int LOCOMX_open(struct net_device *dev)
static
int
LOCOMX_close
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
locomx_data
*
hw
=
ch
->
HW_privdata
;
struct
proc_dir_entry
*
procfile
=
ch
->
procdir
->
subdir
;
...
...
@@ -376,7 +376,7 @@ static int locomx_write_proc(struct file *file, const char *buffer,
static
int
LOCOMX_init
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
locomx_data
*
hw
;
struct
proc_dir_entry
*
new_file
;
...
...
@@ -449,7 +449,7 @@ static int LOCOMX_init(struct net_device *dev)
static
int
LOCOMX_exit
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
ch
->
HW_access_board
=
NULL
;
ch
->
HW_release_board
=
NULL
;
...
...
drivers/net/wan/comx-hw-munich.c
View file @
b88af452
...
...
@@ -373,7 +373,7 @@ static munich_board_t pcicom_boards[MAX_BOARDS];
void
rework_idle_channels
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
slicecom_privdata
*
hw
=
ch
->
HW_privdata
;
munich_board_t
*
board
=
slicecom_boards
+
hw
->
boardnum
;
munich_ccb_t
*
ccb
=
board
->
ccb
;
...
...
@@ -731,7 +731,7 @@ static void pcicom_modemline(unsigned long b)
{
munich_board_t
*
board
=
(
munich_board_t
*
)
b
;
struct
net_device
*
dev
=
board
->
twins
[
0
];
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
unsigned
long
regs
;
regs
=
readl
((
void
*
)(
&
board
->
bar1
[
GPDATA
]));
...
...
@@ -765,7 +765,7 @@ static void pcicom_modemline(unsigned long b)
static
int
MUNICH_txe
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
slicecom_privdata
*
hw
=
ch
->
HW_privdata
;
return
(
hw
->
busy
<
TX_DESC_MAX
-
1
);
...
...
@@ -905,7 +905,7 @@ static int munich_probe(void)
#if 0
static int slicecom_reset(struct net_device *dev)
{
struct comx_channel *ch =
dev->priv
;
struct comx_channel *ch =
netdev_priv(dev)
;
printk("slicecom_reset: resetting the hardware\n");
...
...
@@ -933,7 +933,7 @@ static int slicecom_reset(struct net_device *dev)
static
int
MUNICH_send_packet
(
struct
net_device
*
dev
,
struct
sk_buff
*
skb
)
{
struct
comx_channel
*
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
slicecom_privdata
*
hw
=
ch
->
HW_privdata
;
/* Send it to the debug facility too if needed: */
...
...
@@ -1085,7 +1085,7 @@ static irqreturn_t MUNICH_interrupt(int irq, void *dev_id, struct pt_regs *regs)
goto
go_for_next_interrupt
;
}
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
ch
=
netdev_priv
(
dev
)
;
hw
=
(
struct
slicecom_privdata
*
)
ch
->
HW_privdata
;
// printk("Rx STAT=0x%08x int_info=0x%08x rx_desc_ptr=%d rx_desc.status=0x%01x\n",
...
...
@@ -1125,7 +1125,7 @@ static irqreturn_t MUNICH_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if
(
dev
!=
NULL
)
{
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
ch
=
netdev_priv
(
dev
)
;
hw
=
(
struct
slicecom_privdata
*
)
ch
->
HW_privdata
;
rx_status
=
hw
->
rx_desc
[
hw
->
rx_desc_ptr
].
status
;
...
...
@@ -1261,7 +1261,7 @@ static irqreturn_t MUNICH_interrupt(int irq, void *dev_id, struct pt_regs *regs)
goto
go_for_next_tx_interrupt
;
}
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
ch
=
netdev_priv
(
dev
)
;
hw
=
(
struct
slicecom_privdata
*
)
ch
->
HW_privdata
;
// printk("Tx STAT=0x%08x int_info=0x%08x tiq_ptr=%d\n", stat, int_info.all, board->tiq_ptr );
...
...
@@ -1295,7 +1295,7 @@ static irqreturn_t MUNICH_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
int
newbusy
;
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
ch
=
netdev_priv
(
dev
)
;
hw
=
(
struct
slicecom_privdata
*
)
ch
->
HW_privdata
;
/* We don't trust the "Tx available" info from the TIQ, but check */
...
...
@@ -1398,7 +1398,7 @@ static irqreturn_t MUNICH_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static
int
MUNICH_open
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
slicecom_privdata
*
hw
=
ch
->
HW_privdata
;
struct
proc_dir_entry
*
procfile
=
ch
->
procdir
->
subdir
;
munich_board_t
*
board
;
...
...
@@ -1891,7 +1891,7 @@ static int MUNICH_open(struct net_device *dev)
static
int
MUNICH_close
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
slicecom_privdata
*
hw
=
ch
->
HW_privdata
;
struct
proc_dir_entry
*
procfile
=
ch
->
procdir
->
subdir
;
munich_board_t
*
board
;
...
...
@@ -2028,7 +2028,7 @@ static int MUNICH_close(struct net_device *dev)
static
int
MUNICH_minden
(
struct
net_device
*
dev
,
char
*
page
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
slicecom_privdata
*
hw
=
ch
->
HW_privdata
;
munich_board_t
*
board
;
struct
net_device
*
devp
;
...
...
@@ -2290,7 +2290,7 @@ static int munich_read_proc(char *page, char **start, off_t off, int count,
{
struct
proc_dir_entry
*
file
=
(
struct
proc_dir_entry
*
)
data
;
struct
net_device
*
dev
=
file
->
parent
->
data
;
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
slicecom_privdata
*
hw
=
ch
->
HW_privdata
;
munich_board_t
*
board
;
...
...
@@ -2388,7 +2388,7 @@ static int munich_write_proc(struct file *file, const char *buffer,
{
struct
proc_dir_entry
*
entry
=
(
struct
proc_dir_entry
*
)
data
;
struct
net_device
*
dev
=
(
struct
net_device
*
)
entry
->
parent
->
data
;
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
slicecom_privdata
*
hw
=
ch
->
HW_privdata
;
munich_board_t
*
board
;
...
...
@@ -2656,7 +2656,7 @@ static int init_escape(struct comx_channel *ch)
static
int
BOARD_init
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
slicecom_privdata
*
hw
;
struct
proc_dir_entry
*
new_file
;
...
...
@@ -2772,7 +2772,7 @@ static int BOARD_init(struct net_device *dev)
*/
static
int
BOARD_exit
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
/* Free private data area */
// board = hw->boardnum + (ch->hardware == &pcicomhw ? pcicom_boards : slicecom_boards);
...
...
drivers/net/wan/comx.c
View file @
b88af452
...
...
@@ -119,7 +119,7 @@ struct comx_debugflags_struct comx_debugflags[] = {
int
comx_debug
(
struct
net_device
*
dev
,
char
*
fmt
,
...)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
char
*
page
,
*
str
;
va_list
args
;
int
len
;
...
...
@@ -162,7 +162,7 @@ int comx_debug(struct net_device *dev, char *fmt, ...)
int
comx_debug_skb
(
struct
net_device
*
dev
,
struct
sk_buff
*
skb
,
char
*
msg
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
if
(
!
ch
->
debug_area
)
return
0
;
if
(
!
skb
)
comx_debug
(
dev
,
"%s: %s NULL skb
\n\n
"
,
dev
->
name
,
msg
);
...
...
@@ -175,7 +175,7 @@ int comx_debug_bytes(struct net_device *dev, unsigned char *bytes, int len,
char
*
msg
)
{
int
pos
=
0
;
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
if
(
!
ch
->
debug_area
)
return
0
;
...
...
@@ -207,7 +207,7 @@ int comx_debug_bytes(struct net_device *dev, unsigned char *bytes, int len,
static
void
comx_loadavg_timerfun
(
unsigned
long
d
)
{
struct
net_device
*
dev
=
(
struct
net_device
*
)
d
;
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
ch
->
avg_bytes
[
ch
->
loadavg_counter
]
=
ch
->
current_stats
->
rx_bytes
;
ch
->
avg_bytes
[
ch
->
loadavg_counter
+
ch
->
loadavg_size
]
=
...
...
@@ -222,7 +222,7 @@ static void comx_loadavg_timerfun(unsigned long d)
static void comx_reset_timerfun(unsigned long d)
{
struct net_device *dev = (struct net_device *)d;
struct comx_channel *ch =
dev->priv
;
struct comx_channel *ch =
netdev_priv(dev)
;
if(!(ch->line_status & (PROTO_LOOP | PROTO_UP))) {
if(test_and_set_bit(0,&ch->reset_pending) && ch->HW_reset) {
...
...
@@ -236,7 +236,7 @@ static void comx_reset_timerfun(unsigned long d)
static
int
comx_open
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
proc_dir_entry
*
comxdir
=
ch
->
procdir
->
subdir
;
int
ret
=
0
;
...
...
@@ -268,7 +268,7 @@ static int comx_open(struct net_device *dev)
static
int
comx_close
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
struct
proc_dir_entry
*
comxdir
=
ch
->
procdir
->
subdir
;
int
ret
=
-
ENODEV
;
...
...
@@ -303,7 +303,7 @@ static int comx_close(struct net_device *dev)
void
comx_status
(
struct
net_device
*
dev
,
int
status
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
#if 0
if(status & (PROTO_UP | PROTO_LOOP)) {
...
...
@@ -321,7 +321,7 @@ void comx_status(struct net_device *dev, int status)
static
int
comx_xmit
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
int
rc
;
if
(
skb
->
len
>
dev
->
mtu
+
dev
->
hard_header_len
)
{
...
...
@@ -342,7 +342,7 @@ static int comx_xmit(struct sk_buff *skb, struct net_device *dev)
static
int
comx_header
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
,
unsigned
short
type
,
void
*
daddr
,
void
*
saddr
,
unsigned
len
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
if
(
ch
->
LINE_header
)
{
return
(
ch
->
LINE_header
(
skb
,
dev
,
type
,
daddr
,
saddr
,
len
));
...
...
@@ -354,7 +354,7 @@ static int comx_header(struct sk_buff *skb, struct net_device *dev,
static
int
comx_rebuild_header
(
struct
sk_buff
*
skb
)
{
struct
net_device
*
dev
=
skb
->
dev
;
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
if
(
ch
->
LINE_rebuild_header
)
{
return
(
ch
->
LINE_rebuild_header
(
skb
));
...
...
@@ -365,7 +365,7 @@ static int comx_rebuild_header(struct sk_buff *skb)
int
comx_rx
(
struct
net_device
*
dev
,
struct
sk_buff
*
skb
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
if
(
ch
->
debug_flags
&
DEBUG_COMX_RX
)
{
comx_debug_skb
(
dev
,
skb
,
"comx_rx skb"
);
...
...
@@ -379,7 +379,7 @@ int comx_rx(struct net_device *dev, struct sk_buff *skb)
static
struct
net_device_stats
*
comx_stats
(
struct
net_device
*
dev
)
{
struct
comx_channel
*
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
return
ch
->
current_stats
;
}
...
...
@@ -387,7 +387,7 @@ static struct net_device_stats *comx_stats(struct net_device *dev)
void
comx_lineup_func
(
unsigned
long
d
)
{
struct
net_device
*
dev
=
(
struct
net_device
*
)
d
;
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
del_timer
(
&
ch
->
lineup_timer
);
clear_bit
(
0
,
&
ch
->
lineup_pending
);
...
...
@@ -405,7 +405,7 @@ void comx_lineup_func(unsigned long d)
static
int
comx_statistics
(
struct
net_device
*
dev
,
char
*
page
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
int
len
=
0
;
int
tmp
;
int
i
=
0
;
...
...
@@ -472,7 +472,7 @@ static int comx_statistics(struct net_device *dev, char *page)
static
int
comx_ioctl
(
struct
net_device
*
dev
,
struct
ifreq
*
ifr
,
int
cmd
)
{
struct
comx_channel
*
ch
=
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
if
(
ch
->
LINE_ioctl
)
{
return
(
ch
->
LINE_ioctl
(
dev
,
ifr
,
cmd
));
...
...
@@ -535,7 +535,7 @@ static int comx_read_proc(char *page, char **start, off_t off, int count,
{
struct
proc_dir_entry
*
file
=
(
struct
proc_dir_entry
*
)
data
;
struct
net_device
*
dev
=
file
->
parent
->
data
;
struct
comx_channel
*
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
int
len
=
0
;
if
(
strcmp
(
file
->
name
,
FILENAME_STATUS
)
==
0
)
{
...
...
@@ -599,7 +599,7 @@ static int comx_write_proc(struct file *file, const char *buffer, u_long count,
{
struct
proc_dir_entry
*
entry
=
(
struct
proc_dir_entry
*
)
data
;
struct
net_device
*
dev
=
(
struct
net_device
*
)
entry
->
parent
->
data
;
struct
comx_channel
*
ch
=
(
struct
comx_channel
*
)
dev
->
priv
;
struct
comx_channel
*
ch
=
netdev_priv
(
dev
)
;
char
*
page
;
struct
comx_hardware
*
hw
=
comx_channels
;
struct
comx_protocol
*
line
=
comx_lines
;
...
...
@@ -821,7 +821,7 @@ static int comx_mkdir(struct inode *dir, struct dentry *dentry, int mode)
if
(
register_netdevice
(
dev
))
{
goto
cleanup_filename_debug
;
}
ch
=
dev
->
priv
;
ch
=
netdev_priv
(
dev
)
;
if
((
ch
->
if_ptr
=
(
void
*
)
kmalloc
(
sizeof
(
struct
ppp_device
),
GFP_KERNEL
))
==
NULL
)
{
goto
cleanup_register
;
...
...
@@ -874,7 +874,7 @@ static int comx_rmdir(struct inode *dir, struct dentry *dentry)
lock_kernel
();
dev
=
entry
->
data
;
ch
=
dev
->
priv
;
ch
=
netdev_priv
(
dev
)
;
if
(
dev
->
flags
&
IFF_UP
)
{
printk
(
KERN_ERR
"%s: down interface before removing it
\n
"
,
dev
->
name
);
unlock_kernel
();
...
...
drivers/net/wan/cosa.c
View file @
b88af452
...
...
@@ -639,7 +639,7 @@ static void sppp_channel_delete(struct channel_data *chan)
static
int
cosa_sppp_open
(
struct
net_device
*
d
)
{
struct
channel_data
*
chan
=
d
->
priv
;
struct
channel_data
*
chan
=
netdev_priv
(
d
)
;
int
err
;
unsigned
long
flags
;
...
...
@@ -679,7 +679,7 @@ static int cosa_sppp_open(struct net_device *d)
static
int
cosa_sppp_tx
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
)
{
struct
channel_data
*
chan
=
dev
->
priv
;
struct
channel_data
*
chan
=
netdev_priv
(
dev
)
;
netif_stop_queue
(
dev
);
...
...
@@ -690,7 +690,7 @@ static int cosa_sppp_tx(struct sk_buff *skb, struct net_device *dev)
static
void
cosa_sppp_timeout
(
struct
net_device
*
dev
)
{
struct
channel_data
*
chan
=
dev
->
priv
;
struct
channel_data
*
chan
=
netdev_priv
(
dev
)
;
if
(
test_bit
(
RXBIT
,
&
chan
->
cosa
->
rxtx
))
{
chan
->
stats
.
rx_errors
++
;
...
...
@@ -709,7 +709,7 @@ static void cosa_sppp_timeout(struct net_device *dev)
static
int
cosa_sppp_close
(
struct
net_device
*
d
)
{
struct
channel_data
*
chan
=
d
->
priv
;
struct
channel_data
*
chan
=
netdev_priv
(
d
)
;
unsigned
long
flags
;
netif_stop_queue
(
d
);
...
...
@@ -789,7 +789,7 @@ static int sppp_tx_done(struct channel_data *chan, int size)
static
struct
net_device_stats
*
cosa_net_stats
(
struct
net_device
*
dev
)
{
struct
channel_data
*
chan
=
dev
->
priv
;
struct
channel_data
*
chan
=
netdev_priv
(
dev
)
;
return
&
chan
->
stats
;
}
...
...
@@ -807,7 +807,7 @@ static ssize_t cosa_read(struct file *file,
{
DECLARE_WAITQUEUE
(
wait
,
current
);
unsigned
long
flags
;
struct
channel_data
*
chan
=
(
struct
channel_data
*
)
file
->
private_data
;
struct
channel_data
*
chan
=
file
->
private_data
;
struct
cosa_data
*
cosa
=
chan
->
cosa
;
char
*
kbuf
;
...
...
@@ -881,7 +881,7 @@ static ssize_t cosa_write(struct file *file,
const
char
*
buf
,
size_t
count
,
loff_t
*
ppos
)
{
DECLARE_WAITQUEUE
(
wait
,
current
);
struct
channel_data
*
chan
=
(
struct
channel_data
*
)
file
->
private_data
;
struct
channel_data
*
chan
=
file
->
private_data
;
struct
cosa_data
*
cosa
=
chan
->
cosa
;
unsigned
long
flags
;
char
*
kbuf
;
...
...
@@ -990,7 +990,7 @@ static int cosa_open(struct inode *inode, struct file *file)
static
int
cosa_release
(
struct
inode
*
inode
,
struct
file
*
file
)
{
struct
channel_data
*
channel
=
(
struct
channel_data
*
)
file
->
private_data
;
struct
channel_data
*
channel
=
file
->
private_data
;
struct
cosa_data
*
cosa
;
unsigned
long
flags
;
...
...
@@ -1205,7 +1205,7 @@ static int cosa_sppp_ioctl(struct net_device *dev, struct ifreq *ifr,
int
cmd
)
{
int
rv
;
struct
channel_data
*
chan
=
(
struct
channel_data
*
)
dev
->
priv
;
struct
channel_data
*
chan
=
netdev_priv
(
dev
)
;
rv
=
cosa_ioctl_common
(
chan
->
cosa
,
chan
,
cmd
,
(
unsigned
long
)
ifr
->
ifr_data
);
if
(
rv
==
-
ENOIOCTLCMD
)
{
return
sppp_do_ioctl
(
dev
,
ifr
,
cmd
);
...
...
@@ -1216,7 +1216,7 @@ static int cosa_sppp_ioctl(struct net_device *dev, struct ifreq *ifr,
static
int
cosa_chardev_ioctl
(
struct
inode
*
inode
,
struct
file
*
file
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
struct
channel_data
*
channel
=
(
struct
channel_data
*
)
file
->
private_data
;
struct
channel_data
*
channel
=
file
->
private_data
;
struct
cosa_data
*
cosa
=
channel
->
cosa
;
return
cosa_ioctl_common
(
cosa
,
channel
,
cmd
,
arg
);
}
...
...
drivers/net/wan/lapbether.c
View file @
b88af452
...
...
@@ -198,7 +198,7 @@ static int lapbeth_xmit(struct sk_buff *skb, struct net_device *dev)
static
void
lapbeth_data_transmit
(
struct
net_device
*
ndev
,
struct
sk_buff
*
skb
)
{
struct
lapbethdev
*
lapbeth
=
n
dev
->
priv
;
struct
lapbethdev
*
lapbeth
=
n
etdev_priv
(
ndev
)
;
unsigned
char
*
ptr
;
struct
net_device
*
dev
;
int
size
=
skb
->
len
;
...
...
@@ -269,7 +269,7 @@ static void lapbeth_disconnected(struct net_device *dev, int reason)
*/
static
struct
net_device_stats
*
lapbeth_get_stats
(
struct
net_device
*
dev
)
{
struct
lapbethdev
*
lapbeth
=
(
struct
lapbethdev
*
)
dev
->
priv
;
struct
lapbethdev
*
lapbeth
=
netdev_priv
(
dev
)
;
return
&
lapbeth
->
stats
;
}
...
...
@@ -278,7 +278,7 @@ static struct net_device_stats *lapbeth_get_stats(struct net_device *dev)
*/
static
int
lapbeth_set_mac_address
(
struct
net_device
*
dev
,
void
*
addr
)
{
struct
sockaddr
*
sa
=
(
struct
sockaddr
*
)
addr
;
struct
sockaddr
*
sa
=
addr
;
memcpy
(
dev
->
dev_addr
,
sa
->
sa_data
,
dev
->
addr_len
);
return
0
;
}
...
...
@@ -355,7 +355,7 @@ static int lapbeth_new_device(struct net_device *dev)
if
(
!
ndev
)
goto
out
;
lapbeth
=
n
dev
->
priv
;
lapbeth
=
n
etdev_priv
(
ndev
)
;
lapbeth
->
axdev
=
ndev
;
dev_hold
(
dev
);
...
...
@@ -397,7 +397,7 @@ static int lapbeth_device_event(struct notifier_block *this,
unsigned
long
event
,
void
*
ptr
)
{
struct
lapbethdev
*
lapbeth
;
struct
net_device
*
dev
=
(
struct
net_device
*
)
ptr
;
struct
net_device
*
dev
=
ptr
;
if
(
!
dev_is_ethdev
(
dev
))
return
NOTIFY_DONE
;
...
...
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