projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[cascardo/linux.git]
/
drivers
/
net
/
tokenring
/
lanstreamer.h
diff --git
a/drivers/net/tokenring/lanstreamer.h
b/drivers/net/tokenring/lanstreamer.h
index
13ccee6
..
3c58d6a
100644
(file)
--- a/
drivers/net/tokenring/lanstreamer.h
+++ b/
drivers/net/tokenring/lanstreamer.h
@@
-299,7
+299,6
@@
struct streamer_private {
int tx_ring_free, tx_ring_last_status, rx_ring_last_received,
free_tx_ring_entries;
- struct net_device_stats streamer_stats;
__u16 streamer_lan_status;
__u8 streamer_ring_speed;
__u16 pkt_buf_sz;