linux-next: manual merge of the net-next tree with the net tree

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/vmxnet3/vmxnet3_drv.c between commit efead8710aad ("vmxnet3:
Fix transport header size") from the net tree and commit 8bca5d1ebb8b
("vmxnet3: cleanup tso headers manipulation") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
index 756c0f5,adf527e..0000000

--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c

@@@ -824,14 -820,17 +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)
- 					ctx->l4_hdr_size =
- 							sizeof(struct udphdr);
 -					/*
 -					 * 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);
  				else
  					ctx->l4_hdr_size = 0;
  			} else {

From: Stephen Rothwell <redacted>
Date: Mon, 5 Mar 2012 13:11:03 +1100

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/vmxnet3/vmxnet3_drv.c between commit efead8710aad ("vmxnet3:
Fix transport header size") from the net tree and commit 8bca5d1ebb8b
("vmxnet3: cleanup tso headers manipulation") from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary.

I'm taking care of this right now, thanks Stephen.