vserver 1.9.3

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

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index fdf8f9e..943d5dd 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -45,27 +45,15 @@ static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb)
                        br_pass_frame_up_finish);
 }
 
+/* note: already called with rcu_read_lock (preempt_disabled) */
 int br_handle_frame_finish(struct sk_buff *skb)
 {
-       struct net_bridge *br;
-       unsigned char *dest;
+       const unsigned char *dest = eth_hdr(skb)->h_dest;
+       struct net_bridge_port *p = skb->dev->br_port;
+       struct net_bridge *br = p->br;
        struct net_bridge_fdb_entry *dst;
-       struct net_bridge_port *p;
-       int passedup;
+       int passedup = 0;
 
-       dest = skb->mac.ethernet->h_dest;
-
-       rcu_read_lock();
-       p = skb->dev->br_port;
-       smp_read_barrier_depends();
-
-       if (p == NULL || p->state == BR_STATE_DISABLED) {
-               kfree_skb(skb);
-               goto out;
-       }
-
-       br = p->br;
-       passedup = 0;
        if (br->dev->flags & IFF_PROMISC) {
                struct sk_buff *skb2;
 
@@ -100,28 +88,29 @@ int br_handle_frame_finish(struct sk_buff *skb)
        br_flood_forward(br, skb, 0);
 
 out:
-       rcu_read_unlock();
        return 0;
 }
 
-int br_handle_frame(struct sk_buff *skb)
+/*
+ * Called via br_handle_frame_hook.
+ * Return 0 if *pskb should be processed furthur
+ *       1 if *pskb is handled
+ * note: already called with rcu_read_lock (preempt_disabled) 
+ */
+int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
 {
-       unsigned char *dest;
-       struct net_bridge_port *p;
+       struct sk_buff *skb = *pskb;
+       const unsigned char *dest = eth_hdr(skb)->h_dest;
 
-       dest = skb->mac.ethernet->h_dest;
-
-       rcu_read_lock();
-       p = skb->dev->br_port;
-       if (p == NULL || p->state == BR_STATE_DISABLED)
+       if (p->state == BR_STATE_DISABLED)
                goto err;
 
-       if (skb->mac.ethernet->h_source[0] & 1)
+       if (eth_hdr(skb)->h_source[0] & 1)
                goto err;
 
        if (p->state == BR_STATE_LEARNING ||
            p->state == BR_STATE_FORWARDING)
-               br_fdb_insert(p->br, p, skb->mac.ethernet->h_source, 0);
+               br_fdb_insert(p->br, p, eth_hdr(skb)->h_source, 0);
 
        if (p->br->stp_enabled &&
            !memcmp(dest, bridge_ula, 5) &&
@@ -129,15 +118,16 @@ int br_handle_frame(struct sk_buff *skb)
                if (!dest[5]) {
                        NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, 
                                NULL, br_stp_handle_bpdu);
-                       rcu_read_unlock();
-                       return 0;
+                       return 1;
                }
        }
 
        else if (p->state == BR_STATE_FORWARDING) {
-               if (br_should_route_hook && br_should_route_hook(&skb)) {
-                       rcu_read_unlock();
-                       return -1;
+               if (br_should_route_hook) {
+                       if (br_should_route_hook(pskb)) 
+                               return 0;
+                       skb = *pskb;
+                       dest = eth_hdr(skb)->h_dest;
                }
 
                if (!memcmp(p->br->dev->dev_addr, dest, ETH_ALEN))
@@ -145,12 +135,10 @@ int br_handle_frame(struct sk_buff *skb)
 
                NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
                        br_handle_frame_finish);
-               rcu_read_unlock();
-               return 0;
+               return 1;
        }
 
 err:
-       rcu_read_unlock();
        kfree_skb(skb);
-       return 0;
+       return 1;
 }