net: rtnetlink: ignore NETDEV_PRE_TYPE_CHANGE in rtnetlink_event()

[pandora-kernel.git] / net / core / rtnetlink.c

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 4568120..ffc6cf3 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -600,7 +600,39 @@ static void copy_rtnl_link_stats(struct rtnl_link_stats *a,
 
        a->rx_compressed = b->rx_compressed;
        a->tx_compressed = b->tx_compressed;
-};
+}
+
+static void copy_rtnl_link_stats64(struct rtnl_link_stats64 *a,
+                                  const struct net_device_stats *b)
+{
+       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;
+}
 
 static inline int rtnl_vfinfo_size(const struct net_device *dev)
 {
@@ -698,6 +730,14 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
        stats = dev_get_stats(dev);
        copy_rtnl_link_stats(nla_data(attr), stats);
 
+       attr = nla_reserve(skb, IFLA_STATS64,
+                       sizeof(struct rtnl_link_stats64));
+       if (attr == NULL)
+               goto nla_put_failure;
+
+       stats = dev_get_stats(dev);
+       copy_rtnl_link_stats64(nla_data(attr), stats);
+
        if (dev->netdev_ops->ndo_get_vf_config && dev->dev.parent) {
                int i;
                struct ifla_vf_info ivi;
@@ -1473,6 +1513,7 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
        case NETDEV_POST_INIT:
        case NETDEV_REGISTER:
        case NETDEV_CHANGE:
+       case NETDEV_PRE_TYPE_CHANGE:
        case NETDEV_GOING_DOWN:
        case NETDEV_UNREGISTER:
        case NETDEV_UNREGISTER_BATCH: