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

net: l3mdev: remove redundant calls 



A previous patch added l3mdev flow update making these hooks
redundant. Remove them.

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

net/ipv4/ip_output.c

+1 −2
Original line number Diff line number Diff line
@@ -1582,8 +1582,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, 
	}



	oif = arg->bound_dev_if;

	if (!oif && netif_index_is_l3_master(net, skb->skb_iif))

		oif = skb->skb_iif;

	oif = oif ? : skb->skb_iif;



	flowi4_init_output(&fl4, oif,

			   IP4_REPLY_MARK(net, skb->mark),

net/ipv4/route.c

+2 −10
Original line number Diff line number Diff line
@@ -1831,7 +1831,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
	 *	Now we are ready to route packet.

	 */

	fl4.flowi4_oif = 0;

	fl4.flowi4_iif = l3mdev_fib_oif_rcu(dev);

	fl4.flowi4_iif = dev->ifindex;

	fl4.flowi4_mark = skb->mark;

	fl4.flowi4_tos = tos;

	fl4.flowi4_scope = RT_SCOPE_UNIVERSE;
@@ -2150,7 +2150,6 @@ struct rtable *__ip_route_output_key_hash(struct net *net, struct flowi4 *fl4, 
	unsigned int flags = 0;

	struct fib_result res;

	struct rtable *rth;

	int master_idx;

	int orig_oif;

	int err = -ENETUNREACH;
@@ -2160,9 +2159,6 @@ struct rtable *__ip_route_output_key_hash(struct net *net, struct flowi4 *fl4, 


	orig_oif = fl4->flowi4_oif;



	master_idx = l3mdev_master_ifindex_by_index(net, fl4->flowi4_oif);

	if (master_idx)

		fl4->flowi4_oif = master_idx;

	fl4->flowi4_iif = LOOPBACK_IFINDEX;

	fl4->flowi4_tos = tos & IPTOS_RT_MASK;

	fl4->flowi4_scope = ((tos & RTO_ONLINK) ?
@@ -2263,8 +2259,7 @@ struct rtable *__ip_route_output_key_hash(struct net *net, struct flowi4 *fl4, 
	if (err) {

		res.fi = NULL;

		res.table = NULL;

		if (fl4->flowi4_oif &&

		    !netif_index_is_l3_master(net, fl4->flowi4_oif)) {

		if (fl4->flowi4_oif) {

			/* Apparently, routing tables are wrong. Assume,

			   that the destination is on link.
@@ -2577,9 +2572,6 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh) 
	fl4.flowi4_oif = tb[RTA_OIF] ? nla_get_u32(tb[RTA_OIF]) : 0;

	fl4.flowi4_mark = mark;



	if (netif_index_is_l3_master(net, fl4.flowi4_oif))

		fl4.flowi4_flags = FLOWI_FLAG_L3MDEV_SRC | FLOWI_FLAG_SKIP_NH_OIF;



	if (iif) {

		struct net_device *dev;

net/ipv4/xfrm4_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse) 
	int oif = 0;



	if (skb_dst(skb))

		oif = l3mdev_fib_oif(skb_dst(skb)->dev);

		oif = skb_dst(skb)->dev->ifindex;



	memset(fl4, 0, sizeof(struct flowi4));

	fl4->flowi4_mark = skb->mark;

net/ipv6/ip6_output.c

+0 −2
Original line number Diff line number Diff line
@@ -1070,8 +1070,6 @@ struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6, 
		return ERR_PTR(err);

	if (final_dst)

		fl6->daddr = *final_dst;

	if (!fl6->flowi6_oif)

		fl6->flowi6_oif = l3mdev_fib_oif(dst->dev);



	return xfrm_lookup_route(sock_net(sk), dst, flowi6_to_flowi(fl6), sk, 0);

}

net/ipv6/ndisc.c

+2 −9
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
#include <net/flow.h>

#include <net/ip6_checksum.h>

#include <net/inet_common.h>

#include <net/l3mdev.h>

#include <linux/proc_fs.h>



#include <linux/netfilter.h>
@@ -457,11 +456,9 @@ static void ndisc_send_skb(struct sk_buff *skb, 


	if (!dst) {

		struct flowi6 fl6;

		int oif = l3mdev_fib_oif(skb->dev);

		int oif = skb->dev->ifindex;



		icmpv6_flow_init(sk, &fl6, type, saddr, daddr, oif);

		if (oif != skb->dev->ifindex)

			fl6.flowi6_flags |= FLOWI_FLAG_L3MDEV_SRC;

		dst = icmp6_dst_alloc(skb->dev, &fl6);

		if (IS_ERR(dst)) {

			kfree_skb(skb);
@@ -1538,7 +1535,6 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) 
	int rd_len;

	u8 ha_buf[MAX_ADDR_LEN], *ha = NULL,

	   ops_data_buf[NDISC_OPS_REDIRECT_DATA_SPACE], *ops_data = NULL;

	int oif = l3mdev_fib_oif(dev);

	bool ret;



	if (ipv6_get_lladdr(dev, &saddr_buf, IFA_F_TENTATIVE)) {
@@ -1555,10 +1551,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) 
	}



	icmpv6_flow_init(sk, &fl6, NDISC_REDIRECT,

			 &saddr_buf, &ipv6_hdr(skb)->saddr, oif);



	if (oif != skb->dev->ifindex)

		fl6.flowi6_flags |= FLOWI_FLAG_L3MDEV_SRC;

			 &saddr_buf, &ipv6_hdr(skb)->saddr, dev->ifindex);



	dst = ip6_route_output(net, NULL, &fl6);

	if (dst->error) {