diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-04-17 21:27:27 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-04-17 21:27:27 (GMT) |
| commit | 8da5cdaa7d6304f376b255c125e32a295da97954 (patch) | |
| tree | 1f9f82555ad75ab977c53d7cb192c587b34bab18 /net/ipv4/ip_options.c | |
| parent | c29142c0d3942e2c59ad3b9f780780e65f167d3a (diff) | |
| parent | 2396403a0402caf7b9decbc5d206fa63ba62b6b7 (diff) | |
| download | linux-fsl-qoriq-8da5cdaa7d6304f376b255c125e32a295da97954.tar.xz | |
Merge tag 'v3.8.8'
This is the 3.8.8 stable release
Conflicts:
include/linux/preempt.h
Diffstat (limited to 'net/ipv4/ip_options.c')
| -rw-r--r-- | net/ipv4/ip_options.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index a47fc1d..8433ffe 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -370,7 +370,6 @@ int ip_options_compile(struct net *net, } switch (optptr[3]&0xF) { case IPOPT_TS_TSONLY: - opt->ts = optptr - iph; if (skb) timeptr = &optptr[optptr[2]-1]; opt->ts_needtime = 1; @@ -381,7 +380,6 @@ int ip_options_compile(struct net *net, pp_ptr = optptr + 2; goto error; } - opt->ts = optptr - iph; if (rt) { spec_dst_fill(&spec_dst, skb); memcpy(&optptr[optptr[2]-1], &spec_dst, 4); @@ -396,7 +394,6 @@ int ip_options_compile(struct net *net, pp_ptr = optptr + 2; goto error; } - opt->ts = optptr - iph; { __be32 addr; memcpy(&addr, &optptr[optptr[2]-1], 4); @@ -429,12 +426,12 @@ int ip_options_compile(struct net *net, pp_ptr = optptr + 3; goto error; } - opt->ts = optptr - iph; if (skb) { optptr[3] = (optptr[3]&0xF)|((overflow+1)<<4); opt->is_changed = 1; } } + opt->ts = optptr - iph; break; case IPOPT_RA: if (optlen < 4) { |