diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 17:43:05 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 17:43:05 +0200 |
| commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 (patch) | |
| tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 /drivers/net/tg3.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
| parent | Revert d88dca79d3852a3623f606f781e013d61486828a (diff) | |
| download | linux-2198a10b501fd4443430cb17e065a9e859cc58c9.tar.xz linux-2198a10b501fd4443430cb17e065a9e859cc58c9.zip | |
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 { /* 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; |