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/ipv4/xfrm4_mode_tunnel.c | |
parent | 00ab956f2fefd3673edc16df55beed21834b7bdd (diff) | |
download | linux-5d9c5a32920c5c0e6716b0f6ed16157783dc56a4.tar.gz linux-5d9c5a32920c5c0e6716b0f6ed16157783dc56a4.tar.bz2 linux-5d9c5a32920c5c0e6716b0f6ed16157783dc56a4.zip |
[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/xfrm4_mode_tunnel.c')
-rw-r--r-- | net/ipv4/xfrm4_mode_tunnel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c index f8d880beb12f..13cafbe56ce3 100644 --- a/net/ipv4/xfrm4_mode_tunnel.c +++ b/net/ipv4/xfrm4_mode_tunnel.c @@ -92,7 +92,6 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb) skb->mac.raw = memmove(skb->data - skb->mac_len, skb->mac.raw, skb->mac_len); skb->nh.raw = skb->data; - memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); err = 0; out: |