diff options
Diffstat (limited to 'net')
-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) | |||
40 | else { | 40 | else { |
41 | #ifdef CONFIG_BRIDGE_NETFILTER | 41 | #ifdef CONFIG_BRIDGE_NETFILTER |
42 | /* ip_refrag calls ip_fragment, doesn't copy the MAC header. */ | 42 | /* ip_refrag calls ip_fragment, doesn't copy the MAC header. */ |
43 | nf_bridge_maybe_copy_header(skb); | 43 | if (nf_bridge_maybe_copy_header(skb)) |
44 | kfree_skb(skb); | ||
45 | else | ||
44 | #endif | 46 | #endif |
45 | skb_push(skb, ETH_HLEN); | 47 | { |
48 | skb_push(skb, ETH_HLEN); | ||
46 | 49 | ||
47 | dev_queue_xmit(skb); | 50 | dev_queue_xmit(skb); |
51 | } | ||
48 | } | 52 | } |
49 | 53 | ||
50 | return 0; | 54 | return 0; |