aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_main.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-02 17:31:35 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-02 17:31:35 -0500
commitb23dd4fe42b455af5c6e20966b7d6959fa8352ea (patch)
treebf97323eae9a8d084170e573ff2c0c40bc72c3cd /drivers/net/bonding/bond_main.c
parent452edd598f60522c11f7f88fdbab27eb36509d1a (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 'drivers/net/bonding/bond_main.c')
-rw-r--r--drivers/net/bonding/bond_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 584f97b73060..0592e6da15a6 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2681,7 +2681,7 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, __be32 dest_
2681 2681
2682static void bond_arp_send_all(struct bonding *bond, struct slave *slave) 2682static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
2683{ 2683{
2684 int i, vlan_id, rv; 2684 int i, vlan_id;
2685 __be32 *targets = bond->params.arp_targets; 2685 __be32 *targets = bond->params.arp_targets;
2686 struct vlan_entry *vlan; 2686 struct vlan_entry *vlan;
2687 struct net_device *vlan_dev; 2687 struct net_device *vlan_dev;
@@ -2708,8 +2708,8 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
2708 fl.fl4_dst = targets[i]; 2708 fl.fl4_dst = targets[i];
2709 fl.fl4_tos = RTO_ONLINK; 2709 fl.fl4_tos = RTO_ONLINK;
2710 2710
2711 rv = ip_route_output_key(dev_net(bond->dev), &rt, &fl); 2711 rt = ip_route_output_key(dev_net(bond->dev), &fl);
2712 if (rv) { 2712 if (IS_ERR(rt)) {
2713 if (net_ratelimit()) { 2713 if (net_ratelimit()) {
2714 pr_warning("%s: no route to arp_ip_target %pI4\n", 2714 pr_warning("%s: no route to arp_ip_target %pI4\n",
2715 bond->dev->name, &fl.fl4_dst); 2715 bond->dev->name, &fl.fl4_dst);