This commit was manufactured by cvs2svn to create tag

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

diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index ef9f209..fd5fa75 100644 (file)
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -23,6 +23,7 @@ static inline int should_deliver(const struct net_bridge_port *p,
                                 const struct sk_buff *skb)
 {
        if (skb->dev == p->dev ||
+           skb->len > p->dev->mtu ||
            p->state != BR_STATE_FORWARDING)
                return 0;
 
@@ -31,17 +32,13 @@ static inline int should_deliver(const struct net_bridge_port *p,
 
 int br_dev_queue_push_xmit(struct sk_buff *skb)
 {
-       if (skb->len > skb->dev->mtu) 
-               kfree_skb(skb);
-       else {
 #ifdef CONFIG_BRIDGE_NETFILTER
-               /* ip_refrag calls ip_fragment, doesn't copy the MAC header. */
-               nf_bridge_maybe_copy_header(skb);
+       /* ip_refrag calls ip_fragment, which doesn't copy the MAC header. */
+       nf_bridge_maybe_copy_header(skb);
 #endif
-               skb_push(skb, ETH_HLEN);
+       skb_push(skb, ETH_HLEN);
 
-               dev_queue_xmit(skb);
-       }
+       dev_queue_xmit(skb);
 
        return 0;
 }