diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
commit | 0191b625ca5a46206d2fb862bb08f36f2fcb3b31 (patch) | |
tree | 454d1842b1833d976da62abcbd5c47521ebe9bd7 /arch/s390 | |
parent | 54a696bd07c14d3b1192d03ce7269bc59b45209a (diff) | |
parent | eb56092fc168bf5af199d47af50c0d84a96db898 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
net: Allow dependancies of FDDI & Tokenring to be modular.
igb: Fix build warning when DCA is disabled.
net: Fix warning fallout from recent NAPI interface changes.
gro: Fix potential use after free
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
sfc: When disabling the NIC, close the device rather than unregistering it
sfc: SFT9001: Add cable diagnostics
sfc: Add support for multiple PHY self-tests
sfc: Merge top-level functions for self-tests
sfc: Clean up PHY mode management in loopback self-test
sfc: Fix unreliable link detection in some loopback modes
sfc: Generate unique names for per-NIC workqueues
802.3ad: use standard ethhdr instead of ad_header
802.3ad: generalize out mac address initializer
802.3ad: initialize ports LACPDU from const initializer
802.3ad: remove typedef around ad_system
802.3ad: turn ports is_individual into a bool
802.3ad: turn ports is_enabled into a bool
802.3ad: make ntt bool
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
...
Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/appldata/appldata_net_sum.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c index 3b746556e1a3..fa741f84c5b9 100644 --- a/arch/s390/appldata/appldata_net_sum.c +++ b/arch/s390/appldata/appldata_net_sum.c | |||
@@ -67,7 +67,6 @@ static void appldata_get_net_sum_data(void *data) | |||
67 | int i; | 67 | int i; |
68 | struct appldata_net_sum_data *net_data; | 68 | struct appldata_net_sum_data *net_data; |
69 | struct net_device *dev; | 69 | struct net_device *dev; |
70 | struct net_device_stats *stats; | ||
71 | unsigned long rx_packets, tx_packets, rx_bytes, tx_bytes, rx_errors, | 70 | unsigned long rx_packets, tx_packets, rx_bytes, tx_bytes, rx_errors, |
72 | tx_errors, rx_dropped, tx_dropped, collisions; | 71 | tx_errors, rx_dropped, tx_dropped, collisions; |
73 | 72 | ||
@@ -86,7 +85,8 @@ static void appldata_get_net_sum_data(void *data) | |||
86 | collisions = 0; | 85 | collisions = 0; |
87 | read_lock(&dev_base_lock); | 86 | read_lock(&dev_base_lock); |
88 | for_each_netdev(&init_net, dev) { | 87 | for_each_netdev(&init_net, dev) { |
89 | stats = dev->get_stats(dev); | 88 | const struct net_device_stats *stats = dev_get_stats(dev); |
89 | |||
90 | rx_packets += stats->rx_packets; | 90 | rx_packets += stats->rx_packets; |
91 | tx_packets += stats->tx_packets; | 91 | tx_packets += stats->tx_packets; |
92 | rx_bytes += stats->rx_bytes; | 92 | rx_bytes += stats->rx_bytes; |