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

Commit 58615242 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[IPV4]: Consistency and whitespace cleanup of ip_rcv() 



Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c656491

net/ipv4/ip_input.c

+13 −14
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ drop: 
int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)

{

	struct iphdr *iph;

	u32 len;



	/* When the interface is in promisc. mode, drop all the crap

	 * that it receives, do not try to analyse it.
@@ -402,9 +403,8 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 
	if (ip_fast_csum((u8 *)iph, iph->ihl) != 0)

		goto inhdr_error;



	{

		__u32 len = ntohs(iph->tot_len); 

		if (skb->len < len || len < (iph->ihl<<2))

	len = ntohs(iph->tot_len);

	if (skb->len < len || len < (iph->ihl*4))

		goto inhdr_error;



	/* Our transport medium may have padded the buffer out. Now we know it
@@ -415,7 +415,6 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 
		IP_INC_STATS_BH(IPSTATS_MIB_INDISCARDS);

		goto drop;

	}

	}



	return NF_HOOK(PF_INET, NF_IP_PRE_ROUTING, skb, dev, NULL,

		       ip_rcv_finish);