diff options
| author | James Morris <jmorris@namei.org> | 2008-10-10 18:26:14 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-10-10 18:26:14 -0400 |
| commit | 0da939b0058742ad2d8580b7db6b966d0fc72252 (patch) | |
| tree | 47cb109fdf97135191bff5db4e3bfc905136bf8b /net/ipv4/ip_options.c | |
| parent | 4bdec11f560b8f405a011288a50e65b1a81b3654 (diff) | |
| parent | d91d40799165b0c84c97e7c71fb8039494ff07dc (diff) | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6_next into next
Diffstat (limited to 'net/ipv4/ip_options.c')
| -rw-r--r-- | net/ipv4/ip_options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index be3f18a7a40e..2c88da6e7862 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c | |||
| @@ -438,7 +438,7 @@ int ip_options_compile(struct net *net, | |||
| 438 | goto error; | 438 | goto error; |
| 439 | } | 439 | } |
| 440 | opt->cipso = optptr - iph; | 440 | opt->cipso = optptr - iph; |
| 441 | if (cipso_v4_validate(&optptr)) { | 441 | if (cipso_v4_validate(skb, &optptr)) { |
| 442 | pp_ptr = optptr; | 442 | pp_ptr = optptr; |
| 443 | goto error; | 443 | goto error; |
| 444 | } | 444 | } |