net: fib_rules: decouple address families from real address families

[net-next-2.6.git] / net / core / rtnetlink.c

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index ffc6cf3495acd6f2e4d75a03e13169ed1215452a..78c85985cb30a754d58efa293799d3581639e2a3 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -118,7 +118,11 @@ static rtnl_doit_func rtnl_get_doit(int protocol, int msgindex)
 {
        struct rtnl_link *tab;
 
-       tab = rtnl_msg_handlers[protocol];
+       if (protocol < NPROTO)
+               tab = rtnl_msg_handlers[protocol];
+       else
+               tab = NULL;
+
        if (tab == NULL || tab[msgindex].doit == NULL)
                tab = rtnl_msg_handlers[PF_UNSPEC];
 
@@ -129,7 +133,11 @@ static rtnl_dumpit_func rtnl_get_dumpit(int protocol, int msgindex)
 {
        struct rtnl_link *tab;
 
-       tab = rtnl_msg_handlers[protocol];
+       if (protocol < NPROTO)
+               tab = rtnl_msg_handlers[protocol];
+       else
+               tab = NULL;
+
        if (tab == NULL || tab[msgindex].dumpit == NULL)
                tab = rtnl_msg_handlers[PF_UNSPEC];
 
@@ -602,36 +610,38 @@ static void copy_rtnl_link_stats(struct rtnl_link_stats *a,
        a->tx_compressed = b->tx_compressed;
 }
 
-static void copy_rtnl_link_stats64(struct rtnl_link_stats64 *a,
-                                  const struct net_device_stats *b)
+static void copy_rtnl_link_stats64(void *v, 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;
+       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));
 }
 
 static inline int rtnl_vfinfo_size(const struct net_device *dev)
@@ -651,6 +661,7 @@ static inline size_t if_nlmsg_size(const struct net_device *dev)
               + nla_total_size(IFNAMSIZ) /* IFLA_QDISC */
               + nla_total_size(sizeof(struct rtnl_link_ifmap))
               + nla_total_size(sizeof(struct rtnl_link_stats))
+              + nla_total_size(sizeof(struct rtnl_link_stats64))
               + nla_total_size(MAX_ADDR_LEN) /* IFLA_ADDRESS */
               + nla_total_size(MAX_ADDR_LEN) /* IFLA_BROADCAST */
               + nla_total_size(4) /* IFLA_TXQLEN */
@@ -734,8 +745,6 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
                        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) {
@@ -1443,9 +1452,6 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
                return 0;
 
        family = ((struct rtgenmsg *)NLMSG_DATA(nlh))->rtgen_family;
-       if (family >= NPROTO)
-               return -EAFNOSUPPORT;
-
        sz_idx = type>>2;
        kind = type&3;