diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-19 03:21:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-19 03:21:33 -0400 |
| commit | e1943424e43974f85b82bb31eaf832823bf49ce7 (patch) | |
| tree | 00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c /net/bridge | |
| parent | 88230fd586b4ccc5ffe6d6c2df8cdc495e89ad83 (diff) | |
| parent | 0553c891fabd287726b41076cfd03fe7e5ab596f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_ethtool.c
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 008ff6c4eecf..f3bc322c5891 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
| @@ -249,11 +249,9 @@ static int br_parse_ip_options(struct sk_buff *skb) | |||
| 249 | goto drop; | 249 | goto drop; |
| 250 | } | 250 | } |
| 251 | 251 | ||
| 252 | /* Zero out the CB buffer if no options present */ | 252 | memset(IPCB(skb), 0, sizeof(struct inet_skb_parm)); |
| 253 | if (iph->ihl == 5) { | 253 | if (iph->ihl == 5) |
| 254 | memset(IPCB(skb), 0, sizeof(struct inet_skb_parm)); | ||
| 255 | return 0; | 254 | return 0; |
| 256 | } | ||
| 257 | 255 | ||
| 258 | opt->optlen = iph->ihl*4 - sizeof(struct iphdr); | 256 | opt->optlen = iph->ihl*4 - sizeof(struct iphdr); |
| 259 | if (ip_options_compile(dev_net(dev), opt, skb)) | 257 | if (ip_options_compile(dev_net(dev), opt, skb)) |