datapath: Remove vport MAC address configuration.

The ability to retrieve and set MAC addresses on vports is only
necessary for tunnel ports (the addresses for actual devices can be
retrieved through direct Linux mechanisms).  Tunnel ports only used
the information for the purpose of generating path MTU discovery
packets, which has now been removed.  Current userspace code already
reflects these changes, so this drops the functionality from the
kernel.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Kyle Mestery <kmestery@cisco.com>

diff --git a/datapath/datapath.c b/datapath/datapath.c
index b731c201261b24ba2a8c5c894940427b10d6ce54..04a5e7f2f998a15d0a30ea70956b673ba117a99b 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1787,10 +1787,8 @@ static const struct nla_policy vport_policy[OVS_VPORT_ATTR_MAX + 1] = {
 #ifdef HAVE_NLA_NUL_STRING
        [OVS_VPORT_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
        [OVS_VPORT_ATTR_STATS] = { .len = sizeof(struct ovs_vport_stats) },
-       [OVS_VPORT_ATTR_ADDRESS] = { .len = ETH_ALEN },
 #else
        [OVS_VPORT_ATTR_STATS] = { .minlen = sizeof(struct ovs_vport_stats) },
-       [OVS_VPORT_ATTR_ADDRESS] = { .minlen = ETH_ALEN },
 #endif
        [OVS_VPORT_ATTR_PORT_NO] = { .type = NLA_U32 },
        [OVS_VPORT_ATTR_TYPE] = { .type = NLA_U32 },
@@ -1837,10 +1835,6 @@ static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
                    &vport_stats))
                goto nla_put_failure;
 
-       if (nla_put(skb, OVS_VPORT_ATTR_ADDRESS, ETH_ALEN,
-                   vport->ops->get_addr(vport)))
-               goto nla_put_failure;
-
        err = ovs_vport_get_options(vport, skb);
        if (err == -EMSGSIZE)
                goto error;
@@ -1912,21 +1906,6 @@ static struct vport *lookup_vport(struct net *net,
                return ERR_PTR(-EINVAL);
 }
 
-/* Called with RTNL lock. */
-static int change_vport(struct vport *vport,
-                       struct nlattr *a[OVS_VPORT_ATTR_MAX + 1])
-{
-       int err = 0;
-
-       if (a[OVS_VPORT_ATTR_STATS])
-               ovs_vport_set_stats(vport, nla_data(a[OVS_VPORT_ATTR_STATS]));
-
-       if (a[OVS_VPORT_ATTR_ADDRESS])
-               err = ovs_vport_set_addr(vport, nla_data(a[OVS_VPORT_ATTR_ADDRESS]));
-
-       return err;
-}
-
 static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
 {
        struct nlattr **a = info->attrs;
@@ -1988,15 +1967,13 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
        if (IS_ERR(vport))
                goto exit_unlock;
 
-       err = change_vport(vport, a);
-       if (!err) {
-               reply = ovs_vport_cmd_build_info(vport, info->snd_portid,
-                                                info->snd_seq,
-                                                OVS_VPORT_CMD_NEW);
-               if (IS_ERR(reply))
-                       err = PTR_ERR(reply);
-       }
-       if (err) {
+       if (a[OVS_VPORT_ATTR_STATS])
+               ovs_vport_set_stats(vport, nla_data(a[OVS_VPORT_ATTR_STATS]));
+
+       reply = ovs_vport_cmd_build_info(vport, info->snd_portid, info->snd_seq,
+                                        OVS_VPORT_CMD_NEW);
+       if (IS_ERR(reply)) {
+               err = PTR_ERR(reply);
                ovs_dp_detach_port(vport);
                goto exit_unlock;
        }
@@ -2033,11 +2010,13 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
 
        if (!err && a[OVS_VPORT_ATTR_OPTIONS])
                err = ovs_vport_set_options(vport, a[OVS_VPORT_ATTR_OPTIONS]);
-       if (!err)
-               err = change_vport(vport, a);
-       else
+       if (err)
                goto exit_unlock;
-       if (!err && a[OVS_VPORT_ATTR_UPCALL_PID])
+
+       if (a[OVS_VPORT_ATTR_STATS])
+               ovs_vport_set_stats(vport, nla_data(a[OVS_VPORT_ATTR_STATS]));
+
+       if (a[OVS_VPORT_ATTR_UPCALL_PID])
                vport->upcall_portid = nla_get_u32(a[OVS_VPORT_ATTR_UPCALL_PID]);
 
        reply = ovs_vport_cmd_build_info(vport, info->snd_portid,

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index b6864bfc2105557a2dcfe67fbb28cc51412d83c1..02c642e51e66006c7abd7e54121958552e32197b 100644 (file)
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -819,8 +819,6 @@ struct vport *ovs_tnl_create(const struct vport_parms *parms,
                goto error_free_vport;
        }
 
-       random_ether_addr(mutable->eth_addr);
-
        get_random_bytes(&initial_frag_id, sizeof(int));
        atomic_set(&tnl_vport->frag_id, initial_frag_id);
 
@@ -860,9 +858,7 @@ int ovs_tnl_set_options(struct vport *vport, struct nlattr *options)
                goto error;
        }
 
-       /* Copy fields whose values should be retained. */
        mutable->seq = old_mutable->seq + 1;
-       memcpy(mutable->eth_addr, old_mutable->eth_addr, ETH_ALEN);
 
        /* Parse the others configured by userspace. */
        err = tnl_set_config(ovs_dp_get_net(vport->dp), options, tnl_vport->tnl_ops,
@@ -942,36 +938,12 @@ void ovs_tnl_destroy(struct vport *vport)
        call_rcu(&tnl_vport->rcu, free_port_rcu);
 }
 
-int ovs_tnl_set_addr(struct vport *vport, const unsigned char *addr)
-{
-       struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
-       struct tnl_mutable_config *old_mutable, *mutable;
-
-       old_mutable = rtnl_dereference(tnl_vport->mutable);
-       mutable = kmemdup(old_mutable, sizeof(struct tnl_mutable_config), GFP_KERNEL);
-       if (!mutable)
-               return -ENOMEM;
-
-       old_mutable->mlink = 0;
-
-       memcpy(mutable->eth_addr, addr, ETH_ALEN);
-       assign_config_rcu(vport, mutable);
-
-       return 0;
-}
-
 const char *ovs_tnl_get_name(const struct vport *vport)
 {
        const struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
        return tnl_vport->name;
 }
 
-const unsigned char *ovs_tnl_get_addr(const struct vport *vport)
-{
-       const struct tnl_vport *tnl_vport = tnl_vport_priv(vport);
-       return rcu_dereference_rtnl(tnl_vport->mutable)->eth_addr;
-}
-
 void ovs_tnl_free_linked_skbs(struct sk_buff *skb)
 {
        while (skb) {

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index 0c00c137ac4d8e2eeede424f3c69b1f5fd7d0b43..7ff44f1c5966b9dac4e649ca7b662b35a36e248c 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -96,8 +96,6 @@ static inline void port_key_set_net(struct port_lookup_key *key, struct net *net
  * @rcu: RCU callback head for deferred destruction.
  * @seq: Sequence number for distinguishing configuration versions.
  * @tunnel_hlen: Tunnel header length.
- * @eth_addr: Source address for packets generated by tunnel itself
- * (e.g. ICMP fragmentation needed messages).
  * @out_key: Key to use on output, 0 if this tunnel has no fixed output key.
  * @flags: TNL_F_* flags.
  * @tos: IPv4 TOS value to use for tunnel, 0 if no fixed TOS.
@@ -109,8 +107,6 @@ struct tnl_mutable_config {
 
        unsigned seq;
 
-       unsigned char eth_addr[ETH_ALEN];
-
        /* Configured via OVS_TUNNEL_ATTR_* attributes. */
        __be64  out_key;
        u32     flags;
@@ -170,9 +166,7 @@ void ovs_tnl_destroy(struct vport *);
 int ovs_tnl_set_options(struct vport *, struct nlattr *);
 int ovs_tnl_get_options(const struct vport *, struct sk_buff *);
 
-int ovs_tnl_set_addr(struct vport *vport, const unsigned char *addr);
 const char *ovs_tnl_get_name(const struct vport *vport);
-const unsigned char *ovs_tnl_get_addr(const struct vport *vport);
 int ovs_tnl_send(struct vport *vport, struct sk_buff *skb);
 void ovs_tnl_rcv(struct vport *vport, struct sk_buff *skb);
 

diff --git a/datapath/vport-capwap.c b/datapath/vport-capwap.c
index f45d3491349b03ed5afc07c6d9d572149ecb486d..56e6394a0f0d50ea70e6bd8cbff31ef4c95ce895 100644 (file)
--- a/datapath/vport-capwap.c
+++ b/datapath/vport-capwap.c
@@ -841,9 +841,7 @@ const struct vport_ops ovs_capwap_vport_ops = {
        .exit           = capwap_exit,
        .create         = capwap_create,
        .destroy        = capwap_destroy,
-       .set_addr       = ovs_tnl_set_addr,
        .get_name       = ovs_tnl_get_name,
-       .get_addr       = ovs_tnl_get_addr,
        .get_options    = ovs_tnl_get_options,
        .set_options    = ovs_tnl_set_options,
        .send           = ovs_tnl_send,

diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c
index f6fad26a6f94607655dca5809035df459e1b062b..c0113458ea13f34214a93303cf200e3f1e271695 100644 (file)
--- a/datapath/vport-gre.c
+++ b/datapath/vport-gre.c
@@ -364,9 +364,7 @@ const struct vport_ops ovs_gre_ft_vport_ops = {
        .exit           = gre_exit,
        .create         = gre_create_ft,
        .destroy        = ovs_tnl_destroy,
-       .set_addr       = ovs_tnl_set_addr,
        .get_name       = ovs_tnl_get_name,
-       .get_addr       = ovs_tnl_get_addr,
        .get_options    = ovs_tnl_get_options,
        .set_options    = ovs_tnl_set_options,
        .send           = ovs_tnl_send,
@@ -379,9 +377,7 @@ const struct vport_ops ovs_gre_vport_ops = {
        .exit           = gre_exit,
        .create         = gre_create,
        .destroy        = ovs_tnl_destroy,
-       .set_addr       = ovs_tnl_set_addr,
        .get_name       = ovs_tnl_get_name,
-       .get_addr       = ovs_tnl_get_addr,
        .get_options    = ovs_tnl_get_options,
        .set_options    = ovs_tnl_set_options,
        .send           = ovs_tnl_send,
@@ -394,9 +390,7 @@ const struct vport_ops ovs_gre64_vport_ops = {
        .exit           = gre_exit,
        .create         = gre_create64,
        .destroy        = ovs_tnl_destroy,
-       .set_addr       = ovs_tnl_set_addr,
        .get_name       = ovs_tnl_get_name,
-       .get_addr       = ovs_tnl_get_addr,
        .get_options    = ovs_tnl_get_options,
        .set_options    = ovs_tnl_set_options,
        .send           = ovs_tnl_send,

diff --git a/datapath/vport-internal_dev.c b/datapath/vport-internal_dev.c
index 9e2e7888539c5cba7214c0122fc47c9404c1bbff..a5f2d757f0d6cdfcac4340c7e9ef49193d4eea10 100644 (file)
--- a/datapath/vport-internal_dev.c
+++ b/datapath/vport-internal_dev.c
@@ -292,9 +292,7 @@ const struct vport_ops ovs_internal_vport_ops = {
        .flags          = VPORT_F_REQUIRED | VPORT_F_FLOW,
        .create         = internal_dev_create,
        .destroy        = internal_dev_destroy,
-       .set_addr       = ovs_netdev_set_addr,
        .get_name       = ovs_netdev_get_name,
-       .get_addr       = ovs_netdev_get_addr,
        .get_ifindex    = ovs_netdev_get_ifindex,
        .send           = internal_dev_recv,
 };

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index fb64fe08bb1ac6128ef3407d952fcfcf4c337416..727194e3e767fd1671b7cc53254265c0fc453d9b 100644 (file)
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -193,29 +193,12 @@ static void netdev_destroy(struct vport *vport)
        call_rcu(&netdev_vport->rcu, free_port_rcu);
 }
 
-int ovs_netdev_set_addr(struct vport *vport, const unsigned char *addr)
-{
-       struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-       struct sockaddr sa;
-
-       sa.sa_family = ARPHRD_ETHER;
-       memcpy(sa.sa_data, addr, ETH_ALEN);
-
-       return dev_set_mac_address(netdev_vport->dev, &sa);
-}
-
 const char *ovs_netdev_get_name(const struct vport *vport)
 {
        const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
        return netdev_vport->dev->name;
 }
 
-const unsigned char *ovs_netdev_get_addr(const struct vport *vport)
-{
-       const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-       return netdev_vport->dev->dev_addr;
-}
-
 int ovs_netdev_get_ifindex(const struct vport *vport)
 {
        const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
@@ -383,9 +366,7 @@ const struct vport_ops ovs_netdev_vport_ops = {
        .exit           = netdev_exit,
        .create         = netdev_create,
        .destroy        = netdev_destroy,
-       .set_addr       = ovs_netdev_set_addr,
        .get_name       = ovs_netdev_get_name,
-       .get_addr       = ovs_netdev_get_addr,
        .get_ifindex    = ovs_netdev_get_ifindex,
        .send           = netdev_send,
 };

diff --git a/datapath/vport-netdev.h b/datapath/vport-netdev.h
index a387b8c8d9c7fb44d18d00c20b8b20f8de157992..6478079b3417fd460c9011048be234d62b3478c2 100644 (file)
--- a/datapath/vport-netdev.h
+++ b/datapath/vport-netdev.h
@@ -38,9 +38,7 @@ netdev_vport_priv(const struct vport *vport)
        return vport_priv(vport);
 }
 
-int ovs_netdev_set_addr(struct vport *, const unsigned char *addr);
 const char *ovs_netdev_get_name(const struct vport *);
-const unsigned char *ovs_netdev_get_addr(const struct vport *);
 const char *ovs_netdev_get_config(const struct vport *);
 int ovs_netdev_get_ifindex(const struct vport *);
 

diff --git a/datapath/vport-patch.c b/datapath/vport-patch.c
index 501eb7ad4577c71c7f05b92af18971bbf4dd0a00..ca3a18424b1a655d4291028fcba0a792369cbc73 100644 (file)
--- a/datapath/vport-patch.c
+++ b/datapath/vport-patch.c
@@ -30,7 +30,6 @@ struct patch_config {
        struct rcu_head rcu;
 
        char peer_name[IFNAMSIZ];
-       unsigned char eth_addr[ETH_ALEN];
 };
 
 struct patch_vport {
@@ -159,8 +158,6 @@ static struct vport *patch_create(const struct vport_parms *parms)
        if (err)
                goto error_free_patchconf;
 
-       random_ether_addr(patchconf->eth_addr);
-
        rcu_assign_pointer(patch_vport->patchconf, patchconf);
 
        peer_name = patchconf->peer_name;
@@ -246,35 +243,12 @@ static void update_peers(struct net *net, const char *name, struct vport *vport)
        }
 }
 
-static int patch_set_addr(struct vport *vport, const unsigned char *addr)
-{
-       struct patch_vport *patch_vport = patch_vport_priv(vport);
-       struct patch_config *patchconf;
-
-       patchconf = kmemdup(rtnl_dereference(patch_vport->patchconf),
-                         sizeof(struct patch_config), GFP_KERNEL);
-       if (!patchconf)
-               return -ENOMEM;
-
-       memcpy(patchconf->eth_addr, addr, ETH_ALEN);
-       assign_config_rcu(vport, patchconf);
-
-       return 0;
-}
-
-
 static const char *patch_get_name(const struct vport *vport)
 {
        const struct patch_vport *patch_vport = patch_vport_priv(vport);
        return patch_vport->name;
 }
 
-static const unsigned char *patch_get_addr(const struct vport *vport)
-{
-       const struct patch_vport *patch_vport = patch_vport_priv(vport);
-       return rcu_dereference_rtnl(patch_vport->patchconf)->eth_addr;
-}
-
 static int patch_get_options(const struct vport *vport, struct sk_buff *skb)
 {
        struct patch_vport *patch_vport = patch_vport_priv(vport);
@@ -306,9 +280,7 @@ const struct vport_ops ovs_patch_vport_ops = {
        .exit           = patch_exit,
        .create         = patch_create,
        .destroy        = patch_destroy,
-       .set_addr       = patch_set_addr,
        .get_name       = patch_get_name,
-       .get_addr       = patch_get_addr,
        .get_options    = patch_get_options,
        .set_options    = patch_set_options,
        .send           = patch_send,

diff --git a/datapath/vport-vxlan.c b/datapath/vport-vxlan.c
index f72b95f57dc57e059140f071b1c539f1faf5e0ff..4f9f33941cbaeaba1b4e0fa2a0b3f176e11fd27c 100644 (file)
--- a/datapath/vport-vxlan.c
+++ b/datapath/vport-vxlan.c
@@ -372,9 +372,7 @@ const struct vport_ops ovs_vxlan_vport_ops = {
        .flags          = VPORT_F_TUN_ID,
        .create         = vxlan_tnl_create,
        .destroy        = vxlan_tnl_destroy,
-       .set_addr       = ovs_tnl_set_addr,
        .get_name       = ovs_tnl_get_name,
-       .get_addr       = ovs_tnl_get_addr,
        .get_options    = ovs_tnl_get_options,
        .set_options    = vxlan_set_options,
        .send           = ovs_tnl_send,

diff --git a/datapath/vport.c b/datapath/vport.c
index a78ebfa3aa131bc86ddf0fbd6b4422e339fdb2ce..994df7e65d754bcecd13cc1acb09a99f6771c6a0 100644 (file)
--- a/datapath/vport.c
+++ b/datapath/vport.c
@@ -285,29 +285,6 @@ void ovs_vport_del(struct vport *vport)
        vport->ops->destroy(vport);
 }
 
-/**
- *     ovs_vport_set_addr - set device Ethernet address (for kernel callers)
- *
- * @vport: vport on which to set Ethernet address.
- * @addr: New address.
- *
- * Sets the Ethernet address of the given device.  Some devices may not support
- * setting the Ethernet address, in which case the result will always be
- * -EOPNOTSUPP.  RTNL lock must be held.
- */
-int ovs_vport_set_addr(struct vport *vport, const unsigned char *addr)
-{
-       ASSERT_RTNL();
-
-       if (!is_valid_ether_addr(addr))
-               return -EADDRNOTAVAIL;
-
-       if (vport->ops->set_addr)
-               return vport->ops->set_addr(vport, addr);
-       else
-               return -EOPNOTSUPP;
-}
-
 /**
  *     ovs_vport_set_stats - sets offset device stats
  *

diff --git a/datapath/vport.h b/datapath/vport.h
index 91f8836a6b60d23ef2867ab8029e749e49bfb9e4..9d383caa93515ed690ebcc466158ebafd2ea0d5a 100644 (file)
--- a/datapath/vport.h
+++ b/datapath/vport.h
@@ -45,7 +45,6 @@ void ovs_vport_del(struct vport *);
 
 struct vport *ovs_vport_locate(struct net *net, const char *name);
 
-int ovs_vport_set_addr(struct vport *, const unsigned char *);
 void ovs_vport_set_stats(struct vport *, struct ovs_vport_stats *);
 void ovs_vport_get_stats(struct vport *, struct ovs_vport_stats *);
 
@@ -152,9 +151,7 @@ struct vport_parms {
  * @get_options: Appends vport-specific attributes for the configuration of an
  * existing vport to a &struct sk_buff.  May be %NULL for a vport that does not
  * have any configuration.
- * @set_addr: Set the device's MAC address.  May be null if not supported.
  * @get_name: Get the device's name.
- * @get_addr: Get the device's MAC address.
  * @get_config: Get the device's configuration.
  * @get_ifindex: Get the system interface index associated with the device.
  * May be null if the device does not have an ifindex.
@@ -175,11 +172,8 @@ struct vport_ops {
        int (*set_options)(struct vport *, struct nlattr *);
        int (*get_options)(const struct vport *, struct sk_buff *);
 
-       int (*set_addr)(struct vport *, const unsigned char *);
-
        /* Called with rcu_read_lock or RTNL lock. */
        const char *(*get_name)(const struct vport *);
-       const unsigned char *(*get_addr)(const struct vport *);
        void (*get_config)(const struct vport *, void *);
        int (*get_ifindex)(const struct vport *);
        int (*send)(struct vport *, struct sk_buff *);

diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h
index f471fbc3e51b599e619c381808f67d850f517bcc..738309771e6aa876344a927f8bb6b58a5443267f 100644 (file)
--- a/include/linux/openvswitch.h
+++ b/include/linux/openvswitch.h
@@ -207,7 +207,6 @@ enum ovs_vport_type {
  * this port.  A value of zero indicates that upcalls should not be sent.
  * @OVS_VPORT_ATTR_STATS: A &struct ovs_vport_stats giving statistics for
  * packets sent or received through the vport.
- * @OVS_VPORT_ATTR_ADDRESS: A 6-byte Ethernet address for the vport.
  *
  * These attributes follow the &struct ovs_header within the Generic Netlink
  * payload for %OVS_VPORT_* commands.
@@ -216,8 +215,8 @@ enum ovs_vport_type {
  * %OVS_VPORT_ATTR_NAME attributes are required.  %OVS_VPORT_ATTR_PORT_NO is
  * optional; if not specified a free port number is automatically selected.
  * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type
- * of vport.  %OVS_VPORT_ATTR_STATS and %OVS_VPORT_ATTR_ADDRESS are optional,
- * and other attributes are ignored.
+ * of vport.  %OVS_VPORT_ATTR_STATS is optional and other attributes are
+ * ignored.
  *
  * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to
  * look up the vport to operate on; otherwise dp_idx from the &struct
@@ -231,7 +230,6 @@ enum ovs_vport_attr {
        OVS_VPORT_ATTR_OPTIONS, /* nested attributes, varies by vport type */
        OVS_VPORT_ATTR_UPCALL_PID, /* u32 Netlink PID to receive upcalls */
        OVS_VPORT_ATTR_STATS,   /* struct ovs_vport_stats */
-       OVS_VPORT_ATTR_ADDRESS = 100, /* hardware address */
        __OVS_VPORT_ATTR_MAX
 };
 

diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index 267f6e79260a5ea12c41f5afd23fc3256466aaca..6863e08d4d7dff7b1f7d24846fc28bb506cbf172 100644 (file)
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -1465,10 +1465,6 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport,
         [OVS_VPORT_ATTR_UPCALL_PID] = { .type = NL_A_U32 },
         [OVS_VPORT_ATTR_STATS] = { NL_POLICY_FOR(struct ovs_vport_stats),
                                    .optional = true },
-        [OVS_VPORT_ATTR_ADDRESS] = { .type = NL_A_UNSPEC,
-                                     .min_len = ETH_ADDR_LEN,
-                                     .max_len = ETH_ADDR_LEN,
-                                     .optional = true },
         [OVS_VPORT_ATTR_OPTIONS] = { .type = NL_A_NESTED, .optional = true },
     };
 
@@ -1502,9 +1498,6 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport,
     if (a[OVS_VPORT_ATTR_STATS]) {
         vport->stats = nl_attr_get(a[OVS_VPORT_ATTR_STATS]);
     }
-    if (a[OVS_VPORT_ATTR_ADDRESS]) {
-        vport->address = nl_attr_get(a[OVS_VPORT_ATTR_ADDRESS]);
-    }
     if (a[OVS_VPORT_ATTR_OPTIONS]) {
         vport->options = nl_attr_get(a[OVS_VPORT_ATTR_OPTIONS]);
         vport->options_len = nl_attr_get_size(a[OVS_VPORT_ATTR_OPTIONS]);
@@ -1547,11 +1540,6 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport,
                           vport->stats, sizeof *vport->stats);
     }
 
-    if (vport->address) {
-        nl_msg_put_unspec(buf, OVS_VPORT_ATTR_ADDRESS,
-                          vport->address, ETH_ADDR_LEN);
-    }
-
     if (vport->options) {
         nl_msg_put_nested(buf, OVS_VPORT_ATTR_OPTIONS,
                           vport->options, vport->options_len);

diff --git a/lib/dpif-linux.h b/lib/dpif-linux.h
index 966abc1009fc53c0855919ae40bb545750d2cc48..81062aa81ca762ce0671e584b67b3d0cd42b5036 100644 (file)
--- a/lib/dpif-linux.h
+++ b/lib/dpif-linux.h
@@ -41,7 +41,6 @@ struct dpif_linux_vport {
     const char *name;                      /* OVS_VPORT_ATTR_NAME. */
     const uint32_t *upcall_pid;            /* OVS_VPORT_ATTR_UPCALL_PID. */
     const struct ovs_vport_stats *stats;   /* OVS_VPORT_ATTR_STATS. */
-    const uint8_t *address;                /* OVS_VPORT_ATTR_ADDRESS. */
     const struct nlattr *options;          /* OVS_VPORT_ATTR_OPTIONS. */
     size_t options_len;
 };