From: David S. Miller <davem@davemloft.net>
Date: Sat, 22 Nov 2014 03:28:24 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1459143386c5d868c87903b8d433a52cffcf3e66;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

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

1459143386c5d868c87903b8d433a52cffcf3e66
diff --cc net/openvswitch/flow_netlink.c
index c8fccdded865,089b195c064a..df3c7f20fcee
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@@ -768,10 -685,17 +768,17 @@@ static int ovs_key_from_nlattrs(struct 
  
  		ipv6_key = nla_data(a[OVS_KEY_ATTR_IPV6]);
  		if (!is_mask && ipv6_key->ipv6_frag > OVS_FRAG_TYPE_MAX) {
 -			OVS_NLERR("Unknown IPv6 fragment type (value=%d, max=%d).\n",
 -				ipv6_key->ipv6_frag, OVS_FRAG_TYPE_MAX);
 +			OVS_NLERR(log, "IPv6 frag type %d is out of range max %d",
 +				  ipv6_key->ipv6_frag, OVS_FRAG_TYPE_MAX);
  			return -EINVAL;
  		}
+ 
+ 		if (!is_mask && ipv6_key->ipv6_label & htonl(0xFFF00000)) {
 -			OVS_NLERR("IPv6 flow label %x is out of range (max=%x).\n",
++			OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x).\n",
+ 				  ntohl(ipv6_key->ipv6_label), (1 << 20) - 1);
+ 			return -EINVAL;
+ 		}
+ 
  		SW_FLOW_KEY_PUT(match, ipv6.label,
  				ipv6_key->ipv6_label, is_mask);
  		SW_FLOW_KEY_PUT(match, ip.proto,