Merge git://git.kernel.org/pub/scm/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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/qlogic/qla3xxx.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/vmxnet3/vmxnet3_drv.c
index a9684a53af194414a50eb4a5b62d47abf3cb7b56,756c0f5565a5b185250668c5617b93ee357ff335..3f04ba0a5454cabb470db7bd2db1ffd437401bf3
--- 1/drivers/net/vmxnet3/vmxnet3_drv.c
--- 2/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 {

diff --cc net/core/rtnetlink.c
Simple merge