Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/vxlan.c
	drivers/vhost/net.c
	include/linux/if_vlan.h
	net/core/dev.c

The net/core/dev.c conflict was the overlap of one commit marking an
existing function static whilst another was adding a new function.

In the include/linux/if_vlan.h case, the type used for a local
variable was changed in 'net', whereas the function got rewritten
to fix a stacked vlan bug in 'net-next'.

In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next'
overlapped with an endainness fix for VHOST 1.0 in 'net'.

In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter
in 'net-next' whereas in 'net' there was a bug fix to pass in the
correct network namespace pointer in calls to this function.

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

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index e022cc40303d..8dccca9013ed 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -528,9 +528,9 @@ static void handle_rx(struct vhost_net *net)
                 .msg_controllen = 0,
                 .msg_flags = MSG_DONTWAIT,
         };
-        struct virtio_net_hdr hdr = {
-                .flags = 0,
-                .gso_type = VIRTIO_NET_HDR_GSO_NONE
+        struct virtio_net_hdr_mrg_rxbuf hdr = {
+                .hdr.flags = 0,
+                .hdr.gso_type = VIRTIO_NET_HDR_GSO_NONE
         };
         size_t total_len = 0;
         int err, mergeable;
@@ -614,11 +614,11 @@ static void handle_rx(struct vhost_net *net)
                                vq->iov->iov_base);
                         break;
                 }
-                /* Supply (or replace) ->num_buffers if VIRTIO_NET_F_MRG_RXBUF
-                 * TODO: Should check and handle checksum.
-                 */
+                /* TODO: Should check and handle checksum. */
+
+                hdr.num_buffers = cpu_to_vhost16(vq, headcount);
                 if (likely(mergeable) &&
-                    copy_to_iter(&headcount, 2, &fixup) != 2) {
+                    copy_to_iter(&hdr.num_buffers, 2, &fixup) != 2) {
                         vq_err(vq, "Failed num_buffers write");
                         vhost_discard_vq_desc(vq, headcount);
                         break;