diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-07-21 14:29:53 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-07-21 14:29:53 -0700 |
commit | 5d9c5a32920c5c0e6716b0f6ed16157783dc56a4 (patch) | |
tree | c2a4c05ece938a8166d850cefb281f17615f95ef /net/ipv6 | |
parent | 00ab956f2fefd3673edc16df55beed21834b7bdd (diff) | |
download | kernel_goldelico_gta04-5d9c5a32920c5c0e6716b0f6ed16157783dc56a4.zip kernel_goldelico_gta04-5d9c5a32920c5c0e6716b0f6ed16157783dc56a4.tar.gz kernel_goldelico_gta04-5d9c5a32920c5c0e6716b0f6ed16157783dc56a4.tar.bz2 |
[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/ipv6')
-rw-r--r-- | net/ipv6/sit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index c56aeec..836eecd 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -380,7 +380,6 @@ static int ipip6_rcv(struct sk_buff *skb) secpath_reset(skb); skb->mac.raw = skb->nh.raw; skb->nh.raw = skb->data; - memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); IPCB(skb)->flags = 0; skb->protocol = htons(ETH_P_IPV6); skb->pkt_type = PACKET_HOST; |