summaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-10-17 10:38:33 +0200
committerTakashi Iwai <tiwai@suse.de>2010-10-17 10:38:33 +0200
commit84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0 (patch)
tree6774218cb21d5ffbe704d6ad6beadc8559aaed1c /drivers/net/tg3.h
parent57e35381bc13e6f18ac1ec255ca61ba1a5103e13 (diff)
parentaa73aec6c385e2c797ac25cc7ccf0318031de7c8 (diff)
downloadlinux-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.tar.gz
linux-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.tar.bz2
linux-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/net/tg3.h')
-rw-r--r--drivers/net/tg3.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 4937bd190964..be7ff138a7f9 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2759,7 +2759,7 @@ struct tg3 {
/* begin "everything else" cacheline(s) section */
- struct rtnl_link_stats64 net_stats;
+ unsigned long rx_dropped;
struct rtnl_link_stats64 net_stats_prev;
struct tg3_ethtool_stats estats;
struct tg3_ethtool_stats estats_prev;