Commit c71ad3d4 authored by David Ahern's avatar David Ahern Committed by David S. Miller

net: flow: Remove FLOWI_FLAG_L3MDEV_SRC flag

No longer used
Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent afb460fe
...@@ -165,7 +165,7 @@ static netdev_tx_t vrf_process_v6_outbound(struct sk_buff *skb, ...@@ -165,7 +165,7 @@ static netdev_tx_t vrf_process_v6_outbound(struct sk_buff *skb,
.flowlabel = ip6_flowinfo(iph), .flowlabel = ip6_flowinfo(iph),
.flowi6_mark = skb->mark, .flowi6_mark = skb->mark,
.flowi6_proto = iph->nexthdr, .flowi6_proto = iph->nexthdr,
.flowi6_flags = FLOWI_FLAG_L3MDEV_SRC | FLOWI_FLAG_SKIP_NH_OIF, .flowi6_flags = FLOWI_FLAG_SKIP_NH_OIF,
}; };
int ret = NET_XMIT_DROP; int ret = NET_XMIT_DROP;
struct dst_entry *dst; struct dst_entry *dst;
...@@ -265,8 +265,7 @@ static netdev_tx_t vrf_process_v4_outbound(struct sk_buff *skb, ...@@ -265,8 +265,7 @@ static netdev_tx_t vrf_process_v4_outbound(struct sk_buff *skb,
.flowi4_oif = vrf_dev->ifindex, .flowi4_oif = vrf_dev->ifindex,
.flowi4_iif = LOOPBACK_IFINDEX, .flowi4_iif = LOOPBACK_IFINDEX,
.flowi4_tos = RT_TOS(ip4h->tos), .flowi4_tos = RT_TOS(ip4h->tos),
.flowi4_flags = FLOWI_FLAG_ANYSRC | FLOWI_FLAG_L3MDEV_SRC | .flowi4_flags = FLOWI_FLAG_ANYSRC | FLOWI_FLAG_SKIP_NH_OIF,
FLOWI_FLAG_SKIP_NH_OIF,
.daddr = ip4h->daddr, .daddr = ip4h->daddr,
}; };
struct net *net = dev_net(vrf_dev); struct net *net = dev_net(vrf_dev);
......
...@@ -34,8 +34,7 @@ struct flowi_common { ...@@ -34,8 +34,7 @@ struct flowi_common {
__u8 flowic_flags; __u8 flowic_flags;
#define FLOWI_FLAG_ANYSRC 0x01 #define FLOWI_FLAG_ANYSRC 0x01
#define FLOWI_FLAG_KNOWN_NH 0x02 #define FLOWI_FLAG_KNOWN_NH 0x02
#define FLOWI_FLAG_L3MDEV_SRC 0x04 #define FLOWI_FLAG_SKIP_NH_OIF 0x04
#define FLOWI_FLAG_SKIP_NH_OIF 0x08
__u32 flowic_secid; __u32 flowic_secid;
struct flowi_tunnel flowic_tun_key; struct flowi_tunnel flowic_tun_key;
}; };
......
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