ip_tunnels: convert the mode field of ip_tunnel_info to flags

The mode field holds a single bit of information only (whether the
ip_tunnel_info struct is for rx or tx). Change the mode field to bit flags.
This allows more mode flags to be added.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 4357bae..4a39c09 100644 (file)
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -623,7 +623,7 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev)
 
        if (geneve->collect_md) {
                info = skb_tunnel_info(skb);
-               if (unlikely(info && info->mode != IP_TUNNEL_INFO_TX)) {
+               if (unlikely(info && !(info->mode & IP_TUNNEL_INFO_TX))) {
                        netdev_dbg(dev, "no tunnel metadata\n");
                        goto tx_error;
                }

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 30e56cb..bd1b8cd 100644 (file)
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2113,7 +2113,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
        }
 
        if (vxlan->flags & VXLAN_F_COLLECT_METADATA &&
-           info && info->mode == IP_TUNNEL_INFO_TX) {
+           info && info->mode & IP_TUNNEL_INFO_TX) {
                vxlan_xmit_one(skb, dev, NULL, false);
                return NETDEV_TX_OK;
        }

diff --git a/include/net/dst_metadata.h b/include/net/dst_metadata.h
index 60c0332..2b83f0d 100644 (file)
--- a/include/net/dst_metadata.h
+++ b/include/net/dst_metadata.h
@@ -59,7 +59,6 @@ static inline struct metadata_dst *tun_rx_dst(__be16 flags,
                return NULL;
 
        info = &tun_dst->u.tun_info;
-       info->mode = IP_TUNNEL_INFO_RX;
        info->key.tun_flags = flags;
        info->key.tun_id = tunnel_id;
        info->key.tp_src = 0;

diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 224e4ec..9bdb394 100644 (file)
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -50,13 +50,8 @@ struct ip_tunnel_key {
        __be16                  tp_dst;
 };
 
-/* Indicates whether the tunnel info structure represents receive
- * or transmit tunnel parameters.
- */
-enum {
-       IP_TUNNEL_INFO_RX,
-       IP_TUNNEL_INFO_TX,
-};
+/* Flags for ip_tunnel_info mode. */
+#define IP_TUNNEL_INFO_TX      0x01    /* represents tx tunnel parameters */
 
 struct ip_tunnel_info {
        struct ip_tunnel_key    key;

diff --cc net/ipv4/ip_gre.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge