Commit ed70fcfc authored by Tom Herbert's avatar Tom Herbert Committed by David S. Miller
Browse files

net: Call skb_checksum_init in IPv4 



Call skb_checksum_init instead of private functions.

Signed-off-by: default avatarTom Herbert <therbert@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76ba0aae

include/net/ip.h

+6 −0
Original line number Diff line number Diff line
@@ -342,6 +342,12 @@ static inline void ip_select_ident_more(struct sk_buff *skb, struct dst_entry *d 
		__ip_select_ident(iph, dst, more);

}



static inline __wsum inet_compute_pseudo(struct sk_buff *skb, int proto)

{

	return csum_tcpudp_nofold(ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,

				  skb->len, proto, 0);

}



/*

 *	Map a multicast IP onto multicast MAC for type ethernet.

 */

net/ipv4/tcp_ipv4.c

+2 −23
Original line number Diff line number Diff line
@@ -1744,28 +1744,6 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb) 
	return sk;

}



static __sum16 tcp_v4_checksum_init(struct sk_buff *skb)

{

	const struct iphdr *iph = ip_hdr(skb);



	if (skb->ip_summed == CHECKSUM_COMPLETE) {

		if (!tcp_v4_check(skb->len, iph->saddr,

				  iph->daddr, skb->csum)) {

			skb->ip_summed = CHECKSUM_UNNECESSARY;

			return 0;

		}

	}



	skb->csum = csum_tcpudp_nofold(iph->saddr, iph->daddr,

				       skb->len, IPPROTO_TCP, 0);



	if (skb->len <= 76) {

		return __skb_checksum_complete(skb);

	}

	return 0;

}





/* The socket must have it's spinlock held when we get

 * here.

 *
@@ -1960,7 +1938,8 @@ int tcp_v4_rcv(struct sk_buff *skb) 
	 * Packet length and doff are validated by header prediction,

	 * provided case of th->doff==0 is eliminated.

	 * So, we defer the checks. */

	if (!skb_csum_unnecessary(skb) && tcp_v4_checksum_init(skb))



	if (skb_checksum_init(skb, IPPROTO_TCP, inet_compute_pseudo))

		goto csum_error;



	th = tcp_hdr(skb);

net/ipv4/udp.c

+2 −17
Original line number Diff line number Diff line
@@ -1672,7 +1672,6 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb, 
static inline int udp4_csum_init(struct sk_buff *skb, struct udphdr *uh,

				 int proto)

{

	const struct iphdr *iph;

	int err;



	UDP_SKB_CB(skb)->partial_cov = 0;
@@ -1684,22 +1683,8 @@ static inline int udp4_csum_init(struct sk_buff *skb, struct udphdr *uh, 
			return err;

	}



	iph = ip_hdr(skb);

	if (uh->check == 0) {

		skb->ip_summed = CHECKSUM_UNNECESSARY;

	} else if (skb->ip_summed == CHECKSUM_COMPLETE) {

		if (!csum_tcpudp_magic(iph->saddr, iph->daddr, skb->len,

				      proto, skb->csum))

			skb->ip_summed = CHECKSUM_UNNECESSARY;

	}

	if (!skb_csum_unnecessary(skb))

		skb->csum = csum_tcpudp_nofold(iph->saddr, iph->daddr,

					       skb->len, proto, 0);

	/* Probably, we should checksum udp header (it should be in cache

	 * in any case) and data in tiny packets (< rx copybreak).

	 */



	return 0;

	return skb_checksum_init_zero_check(skb, proto, uh->check,

					    inet_compute_pseudo);

}



/*