openvswitch: Use regular VXLAN net_device device
This gets rid of all OVS specific VXLAN code in the receive and transmit path by using a VXLAN net_device to represent the vport. Only a small shim layer remains which takes care of handling the VXLAN specific OVS Netlink configuration. Unexports vxlan_sock_add(), vxlan_sock_release(), vxlan_xmit_skb() since they are no longer needed. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
c9db965c52
commit
614732eaa1
@@ -47,9 +47,9 @@
|
||||
#include <net/ipv6.h>
|
||||
#include <net/ndisc.h>
|
||||
#include <net/mpls.h>
|
||||
#include <net/vxlan.h>
|
||||
|
||||
#include "flow_netlink.h"
|
||||
#include "vport-vxlan.h"
|
||||
|
||||
struct ovs_len_tbl {
|
||||
int len;
|
||||
@@ -475,7 +475,7 @@ static int vxlan_tun_opt_from_nlattr(const struct nlattr *a,
|
||||
{
|
||||
struct nlattr *tb[OVS_VXLAN_EXT_MAX+1];
|
||||
unsigned long opt_key_offset;
|
||||
struct ovs_vxlan_opts opts;
|
||||
struct vxlan_metadata opts;
|
||||
int err;
|
||||
|
||||
BUILD_BUG_ON(sizeof(opts) > sizeof(match->key->tun_opts));
|
||||
@@ -626,7 +626,7 @@ static int ipv4_tun_from_nlattr(const struct nlattr *attr,
|
||||
static int vxlan_opt_to_nlattr(struct sk_buff *skb,
|
||||
const void *tun_opts, int swkey_tun_opts_len)
|
||||
{
|
||||
const struct ovs_vxlan_opts *opts = tun_opts;
|
||||
const struct vxlan_metadata *opts = tun_opts;
|
||||
struct nlattr *nla;
|
||||
|
||||
nla = nla_nest_start(skb, OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS);
|
||||
|
Reference in New Issue
Block a user