Merge branch 'master' of /repos/git/net-next-2.6

[net-next-2.6.git] / net / bridge / br_device.c

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 1a99c4e04e85f63f5ee0527d1952ac2239aabc9e..f15f9c4a0dd2d17719c58d18ce66b4a2b763503b 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -13,8 +13,11 @@
 
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
+#include <linux/netpoll.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
+#include <linux/list.h>
+#include <linux/netfilter_bridge.h>
 
 #include <asm/uaccess.h>
 #include "br_private.h"
@@ -25,20 +28,39 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
        struct net_bridge *br = netdev_priv(dev);
        const unsigned char *dest = skb->data;
        struct net_bridge_fdb_entry *dst;
+       struct net_bridge_mdb_entry *mdst;
+       struct br_cpu_netstats *brstats = this_cpu_ptr(br->stats);
 
-       dev->stats.tx_packets++;
-       dev->stats.tx_bytes += skb->len;
+#ifdef CONFIG_BRIDGE_NETFILTER
+       if (skb->nf_bridge && (skb->nf_bridge->mask & BRNF_BRIDGED_DNAT)) {
+               br_nf_pre_routing_finish_bridge_slow(skb);
+               return NETDEV_TX_OK;
+       }
+#endif
+
+       brstats->tx_packets++;
+       brstats->tx_bytes += skb->len;
+
+       BR_INPUT_SKB_CB(skb)->brdev = dev;
 
        skb_reset_mac_header(skb);
        skb_pull(skb, ETH_HLEN);
 
-       if (dest[0] & 1)
-               br_flood_deliver(br, skb);
-       else if ((dst = __br_fdb_get(br, dest)) != NULL)
+       if (is_multicast_ether_addr(dest)) {
+               if (br_multicast_rcv(br, NULL, skb))
+                       goto out;
+
+               mdst = br_mdb_get(br, skb);
+               if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))
+                       br_multicast_deliver(mdst, skb);
+               else
+                       br_flood_deliver(br, skb);
+       } else if ((dst = __br_fdb_get(br, dest)) != NULL)
                br_deliver(dst->dst, skb);
        else
                br_flood_deliver(br, skb);
 
+out:
        return NETDEV_TX_OK;
 }
 
@@ -49,6 +71,7 @@ static int br_dev_open(struct net_device *dev)
        br_features_recompute(br);
        netif_start_queue(dev);
        br_stp_enable_bridge(br);
+       br_multicast_open(br);
 
        return 0;
 }
@@ -59,13 +82,41 @@ static void br_dev_set_multicast_list(struct net_device *dev)
 
 static int br_dev_stop(struct net_device *dev)
 {
-       br_stp_disable_bridge(netdev_priv(dev));
+       struct net_bridge *br = netdev_priv(dev);
+
+       br_stp_disable_bridge(br);
+       br_multicast_stop(br);
 
        netif_stop_queue(dev);
 
        return 0;
 }
 
+static struct net_device_stats *br_get_stats(struct net_device *dev)
+{
+       struct net_bridge *br = netdev_priv(dev);
+       struct net_device_stats *stats = &dev->stats;
+       struct br_cpu_netstats sum = { 0 };
+       unsigned int cpu;
+
+       for_each_possible_cpu(cpu) {
+               const struct br_cpu_netstats *bstats
+                       = per_cpu_ptr(br->stats, cpu);
+
+               sum.tx_bytes   += bstats->tx_bytes;
+               sum.tx_packets += bstats->tx_packets;
+               sum.rx_bytes   += bstats->rx_bytes;
+               sum.rx_packets += bstats->rx_packets;
+       }
+
+       stats->tx_bytes   = sum.tx_bytes;
+       stats->tx_packets = sum.tx_packets;
+       stats->rx_bytes   = sum.rx_bytes;
+       stats->rx_packets = sum.rx_packets;
+
+       return stats;
+}
+
 static int br_change_mtu(struct net_device *dev, int new_mtu)
 {
        struct net_bridge *br = netdev_priv(dev);
@@ -147,6 +198,59 @@ static int br_set_tx_csum(struct net_device *dev, u32 data)
        return 0;
 }
 
+#ifdef CONFIG_NET_POLL_CONTROLLER
+bool br_devices_support_netpoll(struct net_bridge *br)
+{
+       struct net_bridge_port *p;
+       bool ret = true;
+       int count = 0;
+       unsigned long flags;
+
+       spin_lock_irqsave(&br->lock, flags);
+       list_for_each_entry(p, &br->port_list, list) {
+               count++;
+               if ((p->dev->priv_flags & IFF_DISABLE_NETPOLL) ||
+                   !p->dev->netdev_ops->ndo_poll_controller)
+                       ret = false;
+       }
+       spin_unlock_irqrestore(&br->lock, flags);
+       return count != 0 && ret;
+}
+
+static void br_poll_controller(struct net_device *br_dev)
+{
+       struct netpoll *np = br_dev->npinfo->netpoll;
+
+       if (np->real_dev != br_dev)
+               netpoll_poll_dev(np->real_dev);
+}
+
+void br_netpoll_cleanup(struct net_device *br_dev)
+{
+       struct net_bridge *br = netdev_priv(br_dev);
+       struct net_bridge_port *p, *n;
+       const struct net_device_ops *ops;
+
+       br->dev->npinfo = NULL;
+       list_for_each_entry_safe(p, n, &br->port_list, list) {
+               if (p->dev) {
+                       ops = p->dev->netdev_ops;
+                       if (ops->ndo_netpoll_cleanup)
+                               ops->ndo_netpoll_cleanup(p->dev);
+                       else
+                               p->dev->npinfo = NULL;
+               }
+       }
+}
+
+#else
+
+void br_netpoll_cleanup(struct net_device *br_dev)
+{
+}
+
+#endif
+
 static const struct ethtool_ops br_ethtool_ops = {
        .get_drvinfo    = br_getinfo,
        .get_link       = ethtool_op_get_link,
@@ -165,19 +269,32 @@ static const struct net_device_ops br_netdev_ops = {
        .ndo_open                = br_dev_open,
        .ndo_stop                = br_dev_stop,
        .ndo_start_xmit          = br_dev_xmit,
+       .ndo_get_stats           = br_get_stats,
        .ndo_set_mac_address     = br_set_mac_address,
        .ndo_set_multicast_list  = br_dev_set_multicast_list,
        .ndo_change_mtu          = br_change_mtu,
        .ndo_do_ioctl            = br_dev_ioctl,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_netpoll_cleanup     = br_netpoll_cleanup,
+       .ndo_poll_controller     = br_poll_controller,
+#endif
 };
 
+static void br_dev_free(struct net_device *dev)
+{
+       struct net_bridge *br = netdev_priv(dev);
+
+       free_percpu(br->stats);
+       free_netdev(dev);
+}
+
 void br_dev_setup(struct net_device *dev)
 {
        random_ether_addr(dev->dev_addr);
        ether_setup(dev);
 
        dev->netdev_ops = &br_netdev_ops;
-       dev->destructor = free_netdev;
+       dev->destructor = br_dev_free;
        SET_ETHTOOL_OPS(dev, &br_ethtool_ops);
        dev->tx_queue_len = 0;
        dev->priv_flags = IFF_EBRIDGE;