diff options
| author | Herbert Xu | 2006-07-21 23:29:53 +0200 |
|---|---|---|
| committer | David S. Miller | 2006-07-21 23:29:53 +0200 |
| commit | 5d9c5a32920c5c0e6716b0f6ed16157783dc56a4 (patch) | |
| tree | c2a4c05ece938a8166d850cefb281f17615f95ef /net/ipv4/ipip.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| download | kernel-qcow2-linux-5d9c5a32920c5c0e6716b0f6ed16157783dc56a4.tar.gz kernel-qcow2-linux-5d9c5a32920c5c0e6716b0f6ed16157783dc56a4.tar.xz kernel-qcow2-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/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 3291d5192aad..76ab50b0d6ef 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -487,7 +487,6 @@ static int ipip_rcv(struct sk_buff *skb) skb->mac.raw = skb->nh.raw; skb->nh.raw = skb->data; - memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); skb->protocol = htons(ETH_P_IP); skb->pkt_type = PACKET_HOST; |