diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 11:43:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 11:43:05 -0400 |
| commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 (patch) | |
| tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 /drivers/net/tg3.h | |
| parent | 9941fb62762253774cc6177d0b9172ece5133fe1 (diff) | |
| parent | db5a753bf198ef7a50e17d2ff358adf37efe8648 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'drivers/net/tg3.h')
| -rw-r--r-- | drivers/net/tg3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 8342190df0ff..4a1974804b9f 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
| @@ -2813,7 +2813,7 @@ struct tg3 { | |||
| 2813 | 2813 | ||
| 2814 | 2814 | ||
| 2815 | /* begin "everything else" cacheline(s) section */ | 2815 | /* begin "everything else" cacheline(s) section */ |
| 2816 | struct rtnl_link_stats64 net_stats; | 2816 | unsigned long rx_dropped; |
| 2817 | struct rtnl_link_stats64 net_stats_prev; | 2817 | struct rtnl_link_stats64 net_stats_prev; |
| 2818 | struct tg3_ethtool_stats estats; | 2818 | struct tg3_ethtool_stats estats; |
| 2819 | struct tg3_ethtool_stats estats_prev; | 2819 | struct tg3_ethtool_stats estats_prev; |