From d247ae1251c07b9687ddc828e5a3767b956e7a28 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 23 Aug 2010 07:14:36 +0000 Subject: [PATCH] --- yaml --- r: 213927 b: refs/heads/master c: afdcba371f9748ac91608bb6c57f170aab7085b4 h: refs/heads/master i: 213925: 05d3148e63879873abaa0b531040c5becfe97c86 213923: 57acdcb25669f1ed94e579e18c4bcd5eeabfa590 213919: 58600c21ccb65d3d5e1708211b8fe82ba8f36b4d v: v3 --- [refs] | 2 +- trunk/net/core/rtnetlink.c | 31 +------------------------------ 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/[refs] b/[refs] index bcdd0726d684..4c4391cf28c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0eec32ff350348e635b3b8d87b989117ce045d25 +refs/heads/master: afdcba371f9748ac91608bb6c57f170aab7085b4 diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c index f78d821bd935..b2a718dfd720 100644 --- a/trunk/net/core/rtnetlink.c +++ b/trunk/net/core/rtnetlink.c @@ -612,36 +612,7 @@ static void copy_rtnl_link_stats(struct rtnl_link_stats *a, static void copy_rtnl_link_stats64(void *v, const struct rtnl_link_stats64 *b) { - struct rtnl_link_stats64 a; - - a.rx_packets = b->rx_packets; - a.tx_packets = b->tx_packets; - a.rx_bytes = b->rx_bytes; - a.tx_bytes = b->tx_bytes; - a.rx_errors = b->rx_errors; - a.tx_errors = b->tx_errors; - a.rx_dropped = b->rx_dropped; - a.tx_dropped = b->tx_dropped; - - a.multicast = b->multicast; - a.collisions = b->collisions; - - a.rx_length_errors = b->rx_length_errors; - a.rx_over_errors = b->rx_over_errors; - a.rx_crc_errors = b->rx_crc_errors; - a.rx_frame_errors = b->rx_frame_errors; - a.rx_fifo_errors = b->rx_fifo_errors; - a.rx_missed_errors = b->rx_missed_errors; - - a.tx_aborted_errors = b->tx_aborted_errors; - a.tx_carrier_errors = b->tx_carrier_errors; - a.tx_fifo_errors = b->tx_fifo_errors; - a.tx_heartbeat_errors = b->tx_heartbeat_errors; - a.tx_window_errors = b->tx_window_errors; - - a.rx_compressed = b->rx_compressed; - a.tx_compressed = b->tx_compressed; - memcpy(v, &a, sizeof(a)); + memcpy(v, b, sizeof(*b)); } /* All VF info */