diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-09 23:22:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-09 23:22:21 -0800 |
| commit | 0ecc103aec454288cbaa5a33d8960ab3467e8a11 (patch) | |
| tree | d911ae41c303a575913b8aca2a49f4acaaf0fc93 /net/bridge | |
| parent | 0012985d184b7b9d4513eacd35771715471e06ef (diff) | |
| parent | 4906f9985e310fc01f956256b0d58ac28b0dcb19 (diff) | |
| download | blackbird-op-linux-0ecc103aec454288cbaa5a33d8960ab3467e8a11.tar.gz blackbird-op-linux-0ecc103aec454288cbaa5a33d8960ab3467e8a11.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/gianfar.c
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_forward.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index bdd9ccea17ce..d2c27c808d3b 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -67,6 +67,11 @@ static void __br_forward(const struct net_bridge_port *to, struct sk_buff *skb) { struct net_device *indev; + if (skb_warn_if_lro(skb)) { + kfree_skb(skb); + return; + } + indev = skb->dev; skb->dev = to->dev; skb_forward_csum(skb); @@ -89,7 +94,7 @@ void br_deliver(const struct net_bridge_port *to, struct sk_buff *skb) /* called with rcu_read_lock */ void br_forward(const struct net_bridge_port *to, struct sk_buff *skb) { - if (!skb_warn_if_lro(skb) && should_deliver(to, skb)) { + if (should_deliver(to, skb)) { __br_forward(to, skb); return; } |
