net: Rename FLOWI_FLAG_VRFSRC to FLOWI_FLAG_L3MDEV_SRC

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 474396353e7f8c7e1519834bdd36017048f9e487..4fd5af1acff05d800a2192da928d979d6bf8cd6e 100644 (file)
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -208,7 +208,7 @@ static netdev_tx_t vrf_process_v4_outbound(struct sk_buff *skb,
                .flowi4_oif = vrf_dev->ifindex,
                .flowi4_iif = LOOPBACK_IFINDEX,
                .flowi4_tos = RT_TOS(ip4h->tos),
-               .flowi4_flags = FLOWI_FLAG_ANYSRC | FLOWI_FLAG_VRFSRC |
+               .flowi4_flags = FLOWI_FLAG_ANYSRC | FLOWI_FLAG_L3MDEV_SRC |
                                FLOWI_FLAG_SKIP_NH_OIF,
                .daddr = ip4h->daddr,
        };
@@ -545,7 +545,7 @@ static struct rtable *vrf_get_rtable(const struct net_device *dev,
 {
        struct rtable *rth = NULL;
 
-       if (!(fl4->flowi4_flags & FLOWI_FLAG_VRFSRC)) {
+       if (!(fl4->flowi4_flags & FLOWI_FLAG_L3MDEV_SRC)) {
                struct net_vrf *vrf = netdev_priv(dev);
 
                rth = vrf->rth;

diff --git a/include/net/flow.h b/include/net/flow.h
index 9b85db85f13cfc2c11713da810260d4da554bde3..83969eebebf3b458bc4160fe0aded6f5d8fdd30c 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -34,7 +34,7 @@ struct flowi_common {
        __u8    flowic_flags;
 #define FLOWI_FLAG_ANYSRC              0x01
 #define FLOWI_FLAG_KNOWN_NH            0x02
-#define FLOWI_FLAG_VRFSRC              0x04
+#define FLOWI_FLAG_L3MDEV_SRC          0x04
 #define FLOWI_FLAG_SKIP_NH_OIF         0x08
        __u32   flowic_secid;
        struct flowi_tunnel flowic_tun_key;

diff --git a/include/net/route.h b/include/net/route.h
index d32cb76f5302d4f8ffdc8801ae64ae6917524db1..3e18d90b3f4ed2facd127e43a4374c0217fcf745 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -267,7 +267,7 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32
                flow_flags |= FLOWI_FLAG_ANYSRC;
 
        if (netif_index_is_l3_master(sock_net(sk), oif))
-               flow_flags |= FLOWI_FLAG_VRFSRC | FLOWI_FLAG_SKIP_NH_OIF;
+               flow_flags |= FLOWI_FLAG_L3MDEV_SRC | FLOWI_FLAG_SKIP_NH_OIF;
 
        flowi4_init_output(fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE,
                           protocol, flow_flags, dst, src, dport, sport);

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 156ba75b6000362c3fcc6e7da64bbfa2796f2587..b2882cfd31367f7a5be82fcc8d869ae7d4d65e87 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1024,7 +1024,7 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
                if (netif_index_is_l3_master(net, ipc.oif)) {
                        flowi4_init_output(fl4, ipc.oif, sk->sk_mark, tos,
                                           RT_SCOPE_UNIVERSE, sk->sk_protocol,
-                                          (flow_flags | FLOWI_FLAG_VRFSRC |
+                                          (flow_flags | FLOWI_FLAG_L3MDEV_SRC |
                                            FLOWI_FLAG_SKIP_NH_OIF),
                                           faddr, saddr, dport,
                                           inet->inet_sport);