forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source 
Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c
This commit is contained in:
David S. Miller 2011-05-17 17:33:11 -04:00
commit 9cbc94eabb
26 changed files with 173 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/bridge/br_netfilter.c
View file

@ -737,7 +737,7 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff *skb,
nf_bridge->mask |= BRNF_PKT_TYPE;
}
if (br_parse_ip_options(skb))
if (pf == PF_INET && br_parse_ip_options(skb))
return NF_DROP;
/* The physdev module checks on this */