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

Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 8f5c02eed47d..cde29f8a37bf 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -870,14 +870,14 @@ static int geneve_newlink(struct net *net, struct net_device *dev,
         __be16 dst_port = htons(GENEVE_UDP_PORT);
         __u8 ttl = 0, tos = 0;
         bool metadata = false;
-        __be32 rem_addr;
-        __u32 vni;
+        __be32 rem_addr = 0;
+        __u32 vni = 0;
 
-        if (!data[IFLA_GENEVE_ID] || !data[IFLA_GENEVE_REMOTE])
-                return -EINVAL;
+        if (data[IFLA_GENEVE_ID])
+                vni = nla_get_u32(data[IFLA_GENEVE_ID]);
 
-        vni = nla_get_u32(data[IFLA_GENEVE_ID]);
-        rem_addr = nla_get_in_addr(data[IFLA_GENEVE_REMOTE]);
+        if (data[IFLA_GENEVE_REMOTE])
+                rem_addr = nla_get_in_addr(data[IFLA_GENEVE_REMOTE]);
 
         if (data[IFLA_GENEVE_TTL])
                 ttl = nla_get_u8(data[IFLA_GENEVE_TTL]);