diff --git a/[refs] b/[refs] index 34d1ef6b6d78..9ea87b10fee5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fd428761adbd5fbd7e23c312955eec1db8ace7a +refs/heads/master: d8e8034dcdef8c8fa94a14c3b555c09e065e742f diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c index 8f1cd7cfa09d..182f2410c23d 100644 --- a/trunk/drivers/net/bnx2.c +++ b/trunk/drivers/net/bnx2.c @@ -6155,7 +6155,7 @@ bnx2_get_stats(struct net_device *dev) { struct bnx2 *bp = netdev_priv(dev); struct statistics_block *stats_blk = bp->stats_blk; - struct net_device_stats *net_stats = &bp->net_stats; + struct net_device_stats *net_stats = &dev->stats; if (bp->stats_blk == NULL) { return net_stats; diff --git a/trunk/drivers/net/bnx2.h b/trunk/drivers/net/bnx2.h index 34ca47812af4..0763108fa1c5 100644 --- a/trunk/drivers/net/bnx2.h +++ b/trunk/drivers/net/bnx2.h @@ -6872,8 +6872,6 @@ struct bnx2 { int pm_cap; int pcix_cap; - struct net_device_stats net_stats; - struct flash_spec *flash_info; u32 flash_size;