Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d9c5a32 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 00ab956f

net/ipv4/ip_gre.c

+0 −1
Original line number Diff line number Diff line
@@ -617,7 +617,6 @@ static int ipgre_rcv(struct sk_buff *skb) 
		skb->mac.raw = skb->nh.raw;

		skb->nh.raw = __pskb_pull(skb, offset);

		skb_postpull_rcsum(skb, skb->h.raw, offset);

		memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));

		skb->pkt_type = PACKET_HOST;

#ifdef CONFIG_NET_IPGRE_BROADCAST

		if (MULTICAST(iph->daddr)) {

net/ipv4/ip_options.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

net/ipv4/ipip.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

net/ipv4/ipmr.c

+0 −2
Original line number Diff line number Diff line
@@ -1461,7 +1461,6 @@ int pim_rcv_v1(struct sk_buff * skb) 
	skb_pull(skb, (u8*)encap - skb->data);

	skb->nh.iph = (struct iphdr *)skb->data;

	skb->dev = reg_dev;

	memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));

	skb->protocol = htons(ETH_P_IP);

	skb->ip_summed = 0;

	skb->pkt_type = PACKET_HOST;
@@ -1517,7 +1516,6 @@ static int pim_rcv(struct sk_buff * skb) 
	skb_pull(skb, (u8*)encap - skb->data);

	skb->nh.iph = (struct iphdr *)skb->data;

	skb->dev = reg_dev;

	memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));

	skb->protocol = htons(ETH_P_IP);

	skb->ip_summed = 0;

	skb->pkt_type = PACKET_HOST;

net/ipv4/xfrm4_mode_tunnel.c

+0 −1
Original line number Diff line number Diff line
@@ -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: