Commit 6e2895a8 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: Rename FLOWI_FLAG_VRFSRC to FLOWI_FLAG_L3MDEV_SRC 



Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4148987a

drivers/net/vrf.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/net/flow.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/ipv4/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);