net: flow: Remove FLOWI_FLAG_L3MDEV_SRC flag

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

No longer used

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

authored by

David Ahern and committed by

David S. Miller 9 years ago c71ad3d4 afb460fe

+3 -5

2 changed files

expand all

drivers

net

vrf.c

include

net

flow.h

+2 -3

drivers/net/vrf.c

··· 165 165 .flowlabel = ip6_flowinfo(iph), 166 166 .flowi6_mark = skb->mark, 167 167 .flowi6_proto = iph->nexthdr, 168 - .flowi6_flags = FLOWI_FLAG_L3MDEV_SRC | FLOWI_FLAG_SKIP_NH_OIF, 168 + .flowi6_flags = FLOWI_FLAG_SKIP_NH_OIF, 169 169 }; 170 170 int ret = NET_XMIT_DROP; 171 171 struct dst_entry *dst; ··· 265 265 .flowi4_oif = vrf_dev->ifindex, 266 266 .flowi4_iif = LOOPBACK_IFINDEX, 267 267 .flowi4_tos = RT_TOS(ip4h->tos), 268 - .flowi4_flags = FLOWI_FLAG_ANYSRC | FLOWI_FLAG_L3MDEV_SRC | 269 - FLOWI_FLAG_SKIP_NH_OIF, 268 + .flowi4_flags = FLOWI_FLAG_ANYSRC | FLOWI_FLAG_SKIP_NH_OIF, 270 269 .daddr = ip4h->daddr, 271 270 }; 272 271 struct net *net = dev_net(vrf_dev);

+1 -2

include/net/flow.h

··· 34 34 __u8 flowic_flags; 35 35 #define FLOWI_FLAG_ANYSRC 0x01 36 36 #define FLOWI_FLAG_KNOWN_NH 0x02 37 - #define FLOWI_FLAG_L3MDEV_SRC 0x04 38 - #define FLOWI_FLAG_SKIP_NH_OIF 0x08 37 + #define FLOWI_FLAG_SKIP_NH_OIF 0x04 39 38 __u32 flowic_secid; 40 39 struct flowi_tunnel flowic_tun_key; 41 40 };