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

Commit e707766c authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

ipv4: Compute net once in ip_rcv 



Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8e1ac79

net/ipv4/ip_input.c

+9 −7
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ static int ip_rcv_finish(struct sock *sk, struct sk_buff *skb) 
int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)

{

	const struct iphdr *iph;

	struct net *net;

	u32 len;



	/* When the interface is in promisc. mode, drop all the crap
@@ -387,11 +388,12 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 
		goto drop;





	IP_UPD_PO_STATS_BH(dev_net(dev), IPSTATS_MIB_IN, skb->len);

	net = dev_net(dev);

	IP_UPD_PO_STATS_BH(net, IPSTATS_MIB_IN, skb->len);



	skb = skb_share_check(skb, GFP_ATOMIC);

	if (!skb) {

		IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INDISCARDS);

		IP_INC_STATS_BH(net, IPSTATS_MIB_INDISCARDS);

		goto out;

	}
@@ -417,7 +419,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 
	BUILD_BUG_ON(IPSTATS_MIB_ECT1PKTS != IPSTATS_MIB_NOECTPKTS + INET_ECN_ECT_1);

	BUILD_BUG_ON(IPSTATS_MIB_ECT0PKTS != IPSTATS_MIB_NOECTPKTS + INET_ECN_ECT_0);

	BUILD_BUG_ON(IPSTATS_MIB_CEPKTS != IPSTATS_MIB_NOECTPKTS + INET_ECN_CE);

	IP_ADD_STATS_BH(dev_net(dev),

	IP_ADD_STATS_BH(net,

			IPSTATS_MIB_NOECTPKTS + (iph->tos & INET_ECN_MASK),

			max_t(unsigned short, 1, skb_shinfo(skb)->gso_segs));
@@ -431,7 +433,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 


	len = ntohs(iph->tot_len);

	if (skb->len < len) {

		IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INTRUNCATEDPKTS);

		IP_INC_STATS_BH(net, IPSTATS_MIB_INTRUNCATEDPKTS);

		goto drop;

	} else if (len < (iph->ihl*4))

		goto inhdr_error;
@@ -441,7 +443,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 
	 * Note this now means skb->len holds ntohs(iph->tot_len).

	 */

	if (pskb_trim_rcsum(skb, len)) {

		IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INDISCARDS);

		IP_INC_STATS_BH(net, IPSTATS_MIB_INDISCARDS);

		goto drop;

	}
@@ -458,9 +460,9 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 
		       ip_rcv_finish);



csum_error:

	IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_CSUMERRORS);

	IP_INC_STATS_BH(net, IPSTATS_MIB_CSUMERRORS);

inhdr_error:

	IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_INHDRERRORS);

	IP_INC_STATS_BH(net, IPSTATS_MIB_INHDRERRORS);

drop:

	kfree_skb(skb);

out: