diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-17 17:33:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-17 17:33:11 -0400 |
| commit | 9cbc94eabb0791906051bbfac024ef2c2be8e079 (patch) | |
| tree | 41ba194e687c6c60f5c883f98737ac83257d0c00 /net/bridge | |
| parent | 1d1652cbdb9885e4d73972263e4cdbe1b0beebfe (diff) | |
| parent | 7cc31a9ae1477abc79d5992b3afe889f25c50c99 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/vmxnet3/vmxnet3_ethtool.c
net/core/dev.c
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 5614907525e1..e1f5ec75e91c 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
| @@ -737,7 +737,7 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff *skb, | |||
| 737 | nf_bridge->mask |= BRNF_PKT_TYPE; | 737 | nf_bridge->mask |= BRNF_PKT_TYPE; |
| 738 | } | 738 | } |
| 739 | 739 | ||
| 740 | if (br_parse_ip_options(skb)) | 740 | if (pf == PF_INET && br_parse_ip_options(skb)) |
| 741 | return NF_DROP; | 741 | return NF_DROP; |
| 742 | 742 | ||
| 743 | /* The physdev module checks on this */ | 743 | /* The physdev module checks on this */ |