Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch

Conflicts:
	net/openvswitch/vport-internal_dev.c

Jesse Gross says:

====================
A couple of minor enhancements for net-next/3.10.  The largest is an
extension to allow variable length metadata to be passed to userspace
with packets.

There is a merge conflict in net/openvswitch/vport-internal_dev.c:
A existing commit modifies internal_dev_mac_addr() and a new commit
deletes it.  The new one is correct, so you can just remove that function.
====================

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

1 files changed, 7 insertions, 6 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index e87a26506dba..43b4ac1bcd10 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -369,8 +369,8 @@ static int queue_userspace_packet(struct net *net, int dp_ifindex,
         len = sizeof(struct ovs_header);
         len += nla_total_size(skb->len);
         len += nla_total_size(FLOW_BUFSIZE);
-        if (upcall_info->cmd == OVS_PACKET_CMD_ACTION)
-                len += nla_total_size(8);
+        if (upcall_info->userdata)
+                len += NLA_ALIGN(upcall_info->userdata->nla_len);
 
         user_skb = genlmsg_new(len, GFP_ATOMIC);
         if (!user_skb) {
@@ -387,8 +387,9 @@ static int queue_userspace_packet(struct net *net, int dp_ifindex,
         nla_nest_end(user_skb, nla);
 
         if (upcall_info->userdata)
-                nla_put_u64(user_skb, OVS_PACKET_ATTR_USERDATA,
-                            nla_get_u64(upcall_info->userdata));
+                __nla_put(user_skb, OVS_PACKET_ATTR_USERDATA,
+                          nla_len(upcall_info->userdata),
+                          nla_data(upcall_info->userdata));
 
         nla = __nla_reserve(user_skb, OVS_PACKET_ATTR_PACKET, skb->len);
 
@@ -543,7 +544,7 @@ static int validate_userspace(const struct nlattr *attr)
 {
         static const struct nla_policy userspace_policy[OVS_USERSPACE_ATTR_MAX + 1] =   {
                 [OVS_USERSPACE_ATTR_PID] = {.type = NLA_U32 },
-                [OVS_USERSPACE_ATTR_USERDATA] = {.type = NLA_U64 },
+                [OVS_USERSPACE_ATTR_USERDATA] = {.type = NLA_UNSPEC },
         };
         struct nlattr *a[OVS_USERSPACE_ATTR_MAX + 1];
         int error;
@@ -1627,7 +1628,7 @@ static struct vport *lookup_vport(struct net *net,
 
                 vport = ovs_vport_rtnl_rcu(dp, port_no);
                 if (!vport)
-                        return ERR_PTR(-ENOENT);
+                        return ERR_PTR(-ENODEV);
                 return vport;
         } else
                 return ERR_PTR(-EINVAL);