This commit was manufactured by cvs2svn to create branch 'vserver'.

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

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index b7e6adc..f564ee9 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -21,57 +21,41 @@
 
 static struct net_device_stats *br_dev_get_stats(struct net_device *dev)
 {
-       struct net_bridge *br;
-
-       br = dev->priv;
-
+       struct net_bridge *br = netdev_priv(dev);
        return &br->statistics;
 }
 
-static int __br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
+int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       struct net_bridge *br;
-       unsigned char *dest;
+       struct net_bridge *br = netdev_priv(dev);
+       const unsigned char *dest = skb->data;
        struct net_bridge_fdb_entry *dst;
 
-       br = dev->priv;
        br->statistics.tx_packets++;
        br->statistics.tx_bytes += skb->len;
 
-       dest = skb->mac.raw = skb->data;
+       skb->mac.raw = skb->data;
        skb_pull(skb, ETH_HLEN);
 
-       if (dest[0] & 1) {
+       rcu_read_lock();
+       if (dest[0] & 1) 
                br_flood_deliver(br, skb, 0);
-               return 0;
-       }
-
-       if ((dst = br_fdb_get(br, dest)) != NULL) {
+       else if ((dst = __br_fdb_get(br, dest)) != NULL)
                br_deliver(dst->dst, skb);
-               br_fdb_put(dst);
-               return 0;
-       }
-
-       br_flood_deliver(br, skb, 0);
-       return 0;
-}
-
-int br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-       int ret;
+       else
+               br_flood_deliver(br, skb, 0);
 
-       rcu_read_lock();
-       ret = __br_dev_xmit(skb, dev);
        rcu_read_unlock();
-
-       return ret;
+       return 0;
 }
 
 static int br_dev_open(struct net_device *dev)
 {
-       netif_start_queue(dev);
+       struct net_bridge *br = netdev_priv(dev);
 
-       br_stp_enable_bridge(dev->priv);
+       br_features_recompute(br);
+       netif_start_queue(dev);
+       br_stp_enable_bridge(br);
 
        return 0;
 }
@@ -82,16 +66,20 @@ static void br_dev_set_multicast_list(struct net_device *dev)
 
 static int br_dev_stop(struct net_device *dev)
 {
-       br_stp_disable_bridge(dev->priv);
+       br_stp_disable_bridge(netdev_priv(dev));
 
        netif_stop_queue(dev);
 
        return 0;
 }
 
-static int br_dev_accept_fastpath(struct net_device *dev, struct dst_entry *dst)
+static int br_change_mtu(struct net_device *dev, int new_mtu)
 {
-       return -1;
+       if (new_mtu < 68 || new_mtu > br_min_mtu(netdev_priv(dev)))
+               return -EINVAL;
+
+       dev->mtu = new_mtu;
+       return 0;
 }
 
 void br_dev_setup(struct net_device *dev)
@@ -105,10 +93,10 @@ void br_dev_setup(struct net_device *dev)
        dev->hard_start_xmit = br_dev_xmit;
        dev->open = br_dev_open;
        dev->set_multicast_list = br_dev_set_multicast_list;
+       dev->change_mtu = br_change_mtu;
        dev->destructor = free_netdev;
        SET_MODULE_OWNER(dev);
        dev->stop = br_dev_stop;
-       dev->accept_fastpath = br_dev_accept_fastpath;
        dev->tx_queue_len = 0;
        dev->set_mac_address = NULL;
        dev->priv_flags = IFF_EBRIDGE;