diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-02 17:31:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-02 17:31:35 -0500 |
commit | b23dd4fe42b455af5c6e20966b7d6959fa8352ea (patch) | |
tree | bf97323eae9a8d084170e573ff2c0c40bc72c3cd /net/ipv4/ipmr.c | |
parent | 452edd598f60522c11f7f88fdbab27eb36509d1a (diff) |
ipv4: Make output route lookup return rtable directly.
Instead of on the stack.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 8b65a12654e7..26ca2f2d37ce 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1618,8 +1618,8 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, | |||
1618 | .fl4_tos = RT_TOS(iph->tos), | 1618 | .fl4_tos = RT_TOS(iph->tos), |
1619 | .proto = IPPROTO_IPIP | 1619 | .proto = IPPROTO_IPIP |
1620 | }; | 1620 | }; |
1621 | 1621 | rt = ip_route_output_key(net, &fl); | |
1622 | if (ip_route_output_key(net, &rt, &fl)) | 1622 | if (IS_ERR(rt)) |
1623 | goto out_free; | 1623 | goto out_free; |
1624 | encap = sizeof(struct iphdr); | 1624 | encap = sizeof(struct iphdr); |
1625 | } else { | 1625 | } else { |
@@ -1629,8 +1629,8 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, | |||
1629 | .fl4_tos = RT_TOS(iph->tos), | 1629 | .fl4_tos = RT_TOS(iph->tos), |
1630 | .proto = IPPROTO_IPIP | 1630 | .proto = IPPROTO_IPIP |
1631 | }; | 1631 | }; |
1632 | 1632 | rt = ip_route_output_key(net, &fl); | |
1633 | if (ip_route_output_key(net, &rt, &fl)) | 1633 | if (IS_ERR(rt)) |
1634 | goto out_free; | 1634 | goto out_free; |
1635 | } | 1635 | } |
1636 | 1636 | ||