Commit dc5321d7 authored by Matthias Schiffer's avatar Matthias Schiffer Committed by David S. Miller

vxlan: get rid of redundant vxlan_dev.flags

There is no good reason to keep the flags twice in vxlan_dev and
vxlan_config.
Signed-off-by: default avatarMatthias Schiffer <mschiffer@universe-factory.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a985343b
This diff is collapsed.
...@@ -232,7 +232,6 @@ struct vxlan_dev { ...@@ -232,7 +232,6 @@ struct vxlan_dev {
struct net_device *dev; struct net_device *dev;
struct net *net; /* netns for packet i/o */ struct net *net; /* netns for packet i/o */
struct vxlan_rdst default_dst; /* default destination */ struct vxlan_rdst default_dst; /* default destination */
u32 flags; /* VXLAN_F_* in vxlan.h */
struct timer_list age_timer; struct timer_list age_timer;
spinlock_t hash_lock; spinlock_t hash_lock;
......
...@@ -40,14 +40,14 @@ static int vxlan_get_options(const struct vport *vport, struct sk_buff *skb) ...@@ -40,14 +40,14 @@ static int vxlan_get_options(const struct vport *vport, struct sk_buff *skb)
if (nla_put_u16(skb, OVS_TUNNEL_ATTR_DST_PORT, ntohs(dst_port))) if (nla_put_u16(skb, OVS_TUNNEL_ATTR_DST_PORT, ntohs(dst_port)))
return -EMSGSIZE; return -EMSGSIZE;
if (vxlan->flags & VXLAN_F_GBP) { if (vxlan->cfg.flags & VXLAN_F_GBP) {
struct nlattr *exts; struct nlattr *exts;
exts = nla_nest_start(skb, OVS_TUNNEL_ATTR_EXTENSION); exts = nla_nest_start(skb, OVS_TUNNEL_ATTR_EXTENSION);
if (!exts) if (!exts)
return -EMSGSIZE; return -EMSGSIZE;
if (vxlan->flags & VXLAN_F_GBP && if (vxlan->cfg.flags & VXLAN_F_GBP &&
nla_put_flag(skb, OVS_VXLAN_EXT_GBP)) nla_put_flag(skb, OVS_VXLAN_EXT_GBP))
return -EMSGSIZE; return -EMSGSIZE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment