From: David S. Miller <davem@davemloft.net>
Date: Tue, 6 Mar 2012 02:16:26 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: upstream/snapshot3+hdmi~7954^2~135
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f6a1ad4295f9291038380178d09978caf6982dd8;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/vmxnet3/vmxnet3_drv.c

Small vmxnet3 conflict with header size bug fix in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

f6a1ad4295f9291038380178d09978caf6982dd8
diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
index a9684a5,756c0f5..3f04ba0
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@@ -820,17 -824,14 +820,12 @@@ vmxnet3_parse_and_copy_hdr(struct sk_bu
  			ctx->eth_ip_hdr_size = skb_checksum_start_offset(skb);
  
  			if (ctx->ipv4) {
 -				struct iphdr *iph = (struct iphdr *)
 -						    skb_network_header(skb);
 +				const struct iphdr *iph = ip_hdr(skb);
 +
  				if (iph->protocol == IPPROTO_TCP)
 -					ctx->l4_hdr_size = ((struct tcphdr *)
 -					   skb_transport_header(skb))->doff * 4;
 +					ctx->l4_hdr_size = tcp_hdrlen(skb);
  				else if (iph->protocol == IPPROTO_UDP)
- 					/*
- 					 * Use tcp header size so that bytes to
- 					 * be copied are more than required by
- 					 * the device.
- 					 */
- 					ctx->l4_hdr_size = sizeof(struct tcphdr);
 -					ctx->l4_hdr_size =
 -							sizeof(struct udphdr);
++					ctx->l4_hdr_size = sizeof(struct udphdr);
  				else
  					ctx->l4_hdr_size = 0;
  			} else {