summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_options.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2006-07-21 14:29:53 -0700
committerDavid S. Miller <davem@davemloft.net>2006-07-21 14:29:53 -0700
commit5d9c5a32920c5c0e6716b0f6ed16157783dc56a4 (patch)
treec2a4c05ece938a8166d850cefb281f17615f95ef /net/ipv4/ip_options.c
parent00ab956f2fefd3673edc16df55beed21834b7bdd (diff)
downloadop-kernel-dev-5d9c5a32920c5c0e6716b0f6ed16157783dc56a4.zip
op-kernel-dev-5d9c5a32920c5c0e6716b0f6ed16157783dc56a4.tar.gz
[IPV4]: Get rid of redundant IPCB->opts initialisation
Now that we always zero the IPCB->opts in ip_rcv, it is no longer necessary to do so before calling netif_rx for tunneled packets. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_options.c')
-rw-r--r--net/ipv4/ip_options.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index cbcae65..406056e 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -256,7 +256,6 @@ int ip_options_compile(struct ip_options * opt, struct sk_buff * skb)
if (!opt) {
opt = &(IPCB(skb)->opt);
- memset(opt, 0, sizeof(struct ip_options));
iph = skb->nh.raw;
opt->optlen = ((struct iphdr *)iph)->ihl*4 - sizeof(struct iphdr);
optptr = iph + sizeof(struct iphdr);
OpenPOWER on IntegriCloud