diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-28 04:59:59 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-28 04:59:59 +0200 |
| commit | 8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70 (patch) | |
| tree | be59573c0af3617d0cd8a7d61f0ed119e58b1156 /net/bridge/br_forward.c | |
| parent | [SCSI] BusLogic gcc 4.1 warning fixes (diff) | |
| parent | [PATCH] Fix tty layer DoS and comment relevant code (diff) | |
| download | linux-8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70.tar.xz linux-8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70.zip | |
Merge ../linux-2.6
Diffstat (limited to 'net/bridge/br_forward.c')
| -rw-r--r-- | net/bridge/br_forward.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index 6ccd32b30809..864fbbc7b24d 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -40,11 +40,15 @@ int br_dev_queue_push_xmit(struct sk_buff *skb) else { #ifdef CONFIG_BRIDGE_NETFILTER /* ip_refrag calls ip_fragment, doesn't copy the MAC header. */ - nf_bridge_maybe_copy_header(skb); + if (nf_bridge_maybe_copy_header(skb)) + kfree_skb(skb); + else #endif - skb_push(skb, ETH_HLEN); + { + skb_push(skb, ETH_HLEN); - dev_queue_xmit(skb); + dev_queue_xmit(skb); + } } return 0; |