Commit 417da66f authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Rework ipmr_rt_fib_lookup() flow key initialization. 



Use information from the skb as much as possible, currently
this means daddr, saddr, and TOS.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 57a503c6

net/ipv4/ipmr.c

+9 −7
Original line number Original line Diff line number Diff line
@@ -1788,12 +1788,14 @@ static int ip_mr_forward(struct net *net, struct mr_table *mrt, 
	return 0;

	return 0;

}

}





static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct rtable *rt)

static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb)

{

{

	struct rtable *rt = skb_rtable(skb);

	struct iphdr *iph = ip_hdr(skb);

	struct flowi4 fl4 = {

	struct flowi4 fl4 = {

		.daddr = rt->rt_key_dst,

		.daddr = iph->daddr,

		.saddr = rt->rt_key_src,

		.saddr = iph->saddr,

		.flowi4_tos = rt->rt_tos,

		.flowi4_tos = iph->tos,

		.flowi4_oif = rt->rt_oif,

		.flowi4_oif = rt->rt_oif,

		.flowi4_iif = rt->rt_iif,

		.flowi4_iif = rt->rt_iif,

		.flowi4_mark = rt->rt_mark,

		.flowi4_mark = rt->rt_mark,
@@ -1825,7 +1827,7 @@ int ip_mr_input(struct sk_buff *skb) 
	if (IPCB(skb)->flags & IPSKB_FORWARDED)

	if (IPCB(skb)->flags & IPSKB_FORWARDED)

		goto dont_forward;

		goto dont_forward;





	mrt = ipmr_rt_fib_lookup(net, skb_rtable(skb));

	mrt = ipmr_rt_fib_lookup(net, skb);

	if (IS_ERR(mrt)) {

	if (IS_ERR(mrt)) {

		kfree_skb(skb);

		kfree_skb(skb);

		return PTR_ERR(mrt);

		return PTR_ERR(mrt);
@@ -1957,7 +1959,7 @@ int pim_rcv_v1(struct sk_buff *skb) 




	pim = igmp_hdr(skb);

	pim = igmp_hdr(skb);





	mrt = ipmr_rt_fib_lookup(net, skb_rtable(skb));

	mrt = ipmr_rt_fib_lookup(net, skb);

	if (IS_ERR(mrt))

	if (IS_ERR(mrt))

		goto drop;

		goto drop;

	if (!mrt->mroute_do_pim ||

	if (!mrt->mroute_do_pim ||
@@ -1989,7 +1991,7 @@ static int pim_rcv(struct sk_buff *skb) 
	     csum_fold(skb_checksum(skb, 0, skb->len, 0))))

	     csum_fold(skb_checksum(skb, 0, skb->len, 0))))

		goto drop;

		goto drop;





	mrt = ipmr_rt_fib_lookup(net, skb_rtable(skb));

	mrt = ipmr_rt_fib_lookup(net, skb);

	if (IS_ERR(mrt))

	if (IS_ERR(mrt))

		goto drop;

		goto drop;

	if (__pim_rcv(mrt, skb, sizeof(*pim))) {

	if (__pim_rcv(mrt, skb, sizeof(*pim))) {