From 2d021523c9e2fb06c669f2a4c9d13684d7d5348f Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Thu, 13 Dec 2007 09:32:04 -0800 Subject: [PATCH] --- yaml --- r: 74877 b: refs/heads/master c: 4a9ecd5960e6a7814f6e3405807d49010ffe3a88 h: refs/heads/master i: 74875: 9e872cbebe0e7590924eca14dc7768f294386f9f v: v3 --- [refs] | 2 +- trunk/include/linux/netfilter_bridge.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0ab9799532e6..c6dd2d877794 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f229d76b4c4a7fae601ea9398b23c2b426ab3b9 +refs/heads/master: 4a9ecd5960e6a7814f6e3405807d49010ffe3a88 diff --git a/trunk/include/linux/netfilter_bridge.h b/trunk/include/linux/netfilter_bridge.h index 533ee351a273..499aa9375901 100644 --- a/trunk/include/linux/netfilter_bridge.h +++ b/trunk/include/linux/netfilter_bridge.h @@ -50,7 +50,8 @@ enum nf_br_hook_priorities { extern int nf_bridge_copy_header(struct sk_buff *skb); static inline int nf_bridge_maybe_copy_header(struct sk_buff *skb) { - if (skb->nf_bridge) + if (skb->nf_bridge && + skb->nf_bridge->mask & (BRNF_BRIDGED | BRNF_BRIDGED_DNAT)) return nf_bridge_copy_header(skb); return 0; }