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
bfda5177
Commit
bfda5177
authored
Apr 03, 2002
by
Dave Jones
Committed by
Jeff Garzik
Apr 03, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small net driver fixes/cleanups related to setting
dev->last_rx equal to jiffies.
parent
a4358d3a
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
5 deletions
+10
-5
drivers/net/eepro100.c
drivers/net/eepro100.c
+1
-0
drivers/net/hamradio/6pack.c
drivers/net/hamradio/6pack.c
+1
-2
drivers/net/hamradio/dmascc.c
drivers/net/hamradio/dmascc.c
+1
-0
drivers/net/hamradio/mkiss.c
drivers/net/hamradio/mkiss.c
+1
-1
drivers/net/hamradio/scc.c
drivers/net/hamradio/scc.c
+1
-1
drivers/net/irda/sa1100_ir.c
drivers/net/irda/sa1100_ir.c
+1
-0
drivers/net/strip.c
drivers/net/strip.c
+1
-0
drivers/net/wan/dscc4.c
drivers/net/wan/dscc4.c
+2
-1
drivers/net/wan/hd6457x.c
drivers/net/wan/hd6457x.c
+1
-0
No files found.
drivers/net/eepro100.c
View file @
bfda5177
...
@@ -1795,6 +1795,7 @@ speedo_rx(struct net_device *dev)
...
@@ -1795,6 +1795,7 @@ speedo_rx(struct net_device *dev)
}
}
skb
->
protocol
=
eth_type_trans
(
skb
,
dev
);
skb
->
protocol
=
eth_type_trans
(
skb
,
dev
);
netif_rx
(
skb
);
netif_rx
(
skb
);
dev
->
last_rx
=
jiffies
;
sp
->
stats
.
rx_packets
++
;
sp
->
stats
.
rx_packets
++
;
sp
->
stats
.
rx_bytes
+=
pkt_len
;
sp
->
stats
.
rx_bytes
+=
pkt_len
;
}
}
...
...
drivers/net/hamradio/6pack.c
View file @
bfda5177
...
@@ -256,7 +256,7 @@ static void sp_bump(struct sixpack *sp, char cmd)
...
@@ -256,7 +256,7 @@ static void sp_bump(struct sixpack *sp, char cmd)
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
protocol
=
htons
(
ETH_P_AX25
);
skb
->
protocol
=
htons
(
ETH_P_AX25
);
netif_rx
(
skb
);
netif_rx
(
skb
);
dev
->
last_rx
=
jiffies
;
sp
->
dev
->
last_rx
=
jiffies
;
sp
->
stats
.
rx_packets
++
;
sp
->
stats
.
rx_packets
++
;
}
}
...
@@ -701,7 +701,6 @@ static struct tty_ldisc sp_ldisc = {
...
@@ -701,7 +701,6 @@ static struct tty_ldisc sp_ldisc = {
/* Initialize 6pack control device -- register 6pack line discipline */
/* Initialize 6pack control device -- register 6pack line discipline */
static
char
msg_banner
[]
__initdata
=
KERN_INFO
"AX.25: 6pack driver, "
SIXPACK_VERSION
" (dynamic channels, max=%d)
\n
"
;
static
char
msg_banner
[]
__initdata
=
KERN_INFO
"AX.25: 6pack driver, "
SIXPACK_VERSION
" (dynamic channels, max=%d)
\n
"
;
static
char
msg_invparm
[]
__initdata
=
KERN_ERR
"6pack: sixpack_maxdev parameter too large.
\n
"
;
static
char
msg_nomem
[]
__initdata
=
KERN_ERR
"6pack: can't allocate sixpack_ctrls[] array! No 6pack available.
\n
"
;
static
char
msg_nomem
[]
__initdata
=
KERN_ERR
"6pack: can't allocate sixpack_ctrls[] array! No 6pack available.
\n
"
;
static
char
msg_regfail
[]
__initdata
=
KERN_ERR
"6pack: can't register line discipline (err = %d)
\n
"
;
static
char
msg_regfail
[]
__initdata
=
KERN_ERR
"6pack: can't register line discipline (err = %d)
\n
"
;
...
...
drivers/net/hamradio/dmascc.c
View file @
bfda5177
...
@@ -1121,6 +1121,7 @@ static void rx_bh(void *arg) {
...
@@ -1121,6 +1121,7 @@ static void rx_bh(void *arg) {
skb
->
protocol
=
ntohs
(
ETH_P_AX25
);
skb
->
protocol
=
ntohs
(
ETH_P_AX25
);
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
mac
.
raw
=
skb
->
data
;
netif_rx
(
skb
);
netif_rx
(
skb
);
priv
->
dev
->
last_rx
=
jiffies
;
priv
->
stats
.
rx_packets
++
;
priv
->
stats
.
rx_packets
++
;
priv
->
stats
.
rx_bytes
+=
cb
;
priv
->
stats
.
rx_bytes
+=
cb
;
}
}
...
...
drivers/net/hamradio/mkiss.c
View file @
bfda5177
...
@@ -345,7 +345,7 @@ static void ax_bump(struct ax_disp *ax)
...
@@ -345,7 +345,7 @@ static void ax_bump(struct ax_disp *ax)
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
protocol
=
htons
(
ETH_P_AX25
);
skb
->
protocol
=
htons
(
ETH_P_AX25
);
netif_rx
(
skb
);
netif_rx
(
skb
);
dev
->
last_rx
=
jiffies
;
tmp_ax
->
dev
->
last_rx
=
jiffies
;
tmp_ax
->
rx_packets
++
;
tmp_ax
->
rx_packets
++
;
}
}
...
...
drivers/net/hamradio/scc.c
View file @
bfda5177
...
@@ -1661,7 +1661,7 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)
...
@@ -1661,7 +1661,7 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
pkt_type
=
PACKET_HOST
;
netif_rx
(
skb
);
netif_rx
(
skb
);
dev
->
last_rx
=
jiffies
;
scc
->
dev
->
last_rx
=
jiffies
;
return
;
return
;
}
}
...
...
drivers/net/irda/sa1100_ir.c
View file @
bfda5177
...
@@ -597,6 +597,7 @@ static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev
...
@@ -597,6 +597,7 @@ static void sa1100_irda_fir_error(struct sa1100_irda *si, struct net_device *dev
sa1100_irda_rx_alloc
(
si
);
sa1100_irda_rx_alloc
(
si
);
netif_rx
(
skb
);
netif_rx
(
skb
);
dev
->
last_rx
=
jiffies
;
}
else
{
}
else
{
/*
/*
* Remap the buffer.
* Remap the buffer.
...
...
drivers/net/strip.c
View file @
bfda5177
...
@@ -2080,6 +2080,7 @@ static void deliver_packet(struct strip *strip_info, STRIP_Header *header, __u16
...
@@ -2080,6 +2080,7 @@ static void deliver_packet(struct strip *strip_info, STRIP_Header *header, __u16
#ifdef EXT_COUNTERS
#ifdef EXT_COUNTERS
strip_info
->
rx_bytes
+=
packetlen
;
strip_info
->
rx_bytes
+=
packetlen
;
#endif
#endif
skb
->
dev
->
last_rx
=
jiffies
;
netif_rx
(
skb
);
netif_rx
(
skb
);
}
}
}
}
...
...
drivers/net/wan/dscc4.c
View file @
bfda5177
...
@@ -515,8 +515,9 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv, int cur,
...
@@ -515,8 +515,9 @@ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv, int cur,
stats
->
rx_bytes
+=
pkt_len
;
stats
->
rx_bytes
+=
pkt_len
;
skb
->
tail
+=
pkt_len
;
skb
->
tail
+=
pkt_len
;
skb
->
len
=
pkt_len
;
skb
->
len
=
pkt_len
;
if
(
netif_running
(
dev
))
if
(
netif_running
(
dev
))
skb
->
protocol
=
htons
(
ETH_P_HDLC
);
skb
->
protocol
=
htons
(
ETH_P_HDLC
);
skb
->
dev
->
last_rx
=
jiffies
;
netif_rx
(
skb
);
netif_rx
(
skb
);
try_get_rx_skb
(
dpriv
,
cur
,
dev
);
try_get_rx_skb
(
dpriv
,
cur
,
dev
);
}
else
{
}
else
{
...
...
drivers/net/wan/hd6457x.c
View file @
bfda5177
...
@@ -291,6 +291,7 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc *desc, u8 rxin)
...
@@ -291,6 +291,7 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc *desc, u8 rxin)
#endif
#endif
port
->
hdlc
.
stats
.
rx_packets
++
;
port
->
hdlc
.
stats
.
rx_packets
++
;
port
->
hdlc
.
stats
.
rx_bytes
+=
skb
->
len
;
port
->
hdlc
.
stats
.
rx_bytes
+=
skb
->
len
;
skb
->
dev
->
last_rx
=
jiffies
;
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
dev
=
hdlc_to_dev
(
&
port
->
hdlc
);
skb
->
dev
=
hdlc_to_dev
(
&
port
->
hdlc
);
skb
->
protocol
=
htons
(
ETH_P_HDLC
);
skb
->
protocol
=
htons
(
ETH_P_HDLC
);
...
...
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