diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-02 14:31:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-02 14:31:35 -0800 |
| commit | b23dd4fe42b455af5c6e20966b7d6959fa8352ea (patch) | |
| tree | bf97323eae9a8d084170e573ff2c0c40bc72c3cd /net/ipv6/sit.c | |
| parent | 452edd598f60522c11f7f88fdbab27eb36509d1a (diff) | |
| download | blackbird-obmc-linux-b23dd4fe42b455af5c6e20966b7d6959fa8352ea.tar.gz blackbird-obmc-linux-b23dd4fe42b455af5c6e20966b7d6959fa8352ea.zip | |
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/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index b1599a345c10..b8c8adbd7cf6 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -738,7 +738,8 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, .fl4_tos = RT_TOS(tos), .oif = tunnel->parms.link, .proto = IPPROTO_IPV6 }; - if (ip_route_output_key(dev_net(dev), &rt, &fl)) { + rt = ip_route_output_key(dev_net(dev), &fl); + if (IS_ERR(rt)) { dev->stats.tx_carrier_errors++; goto tx_error_icmp; } @@ -862,8 +863,9 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev) .fl4_tos = RT_TOS(iph->tos), .oif = tunnel->parms.link, .proto = IPPROTO_IPV6 }; - struct rtable *rt; - if (!ip_route_output_key(dev_net(dev), &rt, &fl)) { + struct rtable *rt = ip_route_output_key(dev_net(dev), &fl); + + if (!IS_ERR(rt)) { tdev = rt->dst.dev; ip_rt_put(rt); } |
