Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor overlapping changes, nothing serious. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -645,6 +645,7 @@ static const struct nla_policy packet_policy[OVS_PACKET_ATTR_MAX + 1] = {
|
||||
[OVS_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED },
|
||||
[OVS_PACKET_ATTR_PROBE] = { .type = NLA_FLAG },
|
||||
[OVS_PACKET_ATTR_MRU] = { .type = NLA_U16 },
|
||||
[OVS_PACKET_ATTR_HASH] = { .type = NLA_U64 },
|
||||
};
|
||||
|
||||
static const struct genl_ops dp_packet_genl_ops[] = {
|
||||
|
Reference in New Issue
Block a user