net: seeq: Fix the function used to release some memory in an error handling path

[sfrench/cifs-2.6.git] / drivers / net / net_failover.c

diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
index ed1166adaa2fd8a270f55f575d18739e4be462ad..b16a1221d19b97029c84a9e91d06a70babe4a9db 100644 (file)
--- a/drivers/net/net_failover.c
+++ b/drivers/net/net_failover.c
@@ -115,8 +115,7 @@ static netdev_tx_t net_failover_start_xmit(struct sk_buff *skb,
 
 static u16 net_failover_select_queue(struct net_device *dev,
                                     struct sk_buff *skb,
-                                    struct net_device *sb_dev,
-                                    select_queue_fallback_t fallback)
+                                    struct net_device *sb_dev)
 {
        struct net_failover_info *nfo_info = netdev_priv(dev);
        struct net_device *primary_dev;
@@ -127,10 +126,9 @@ static u16 net_failover_select_queue(struct net_device *dev,
                const struct net_device_ops *ops = primary_dev->netdev_ops;
 
                if (ops->ndo_select_queue)
-                       txq = ops->ndo_select_queue(primary_dev, skb,
-                                                   sb_dev, fallback);
+                       txq = ops->ndo_select_queue(primary_dev, skb, sb_dev);
                else
-                       txq = fallback(primary_dev, skb, NULL);
+                       txq = netdev_pick_tx(primary_dev, skb, NULL);
 
                qdisc_skb_cb(skb)->slave_dev_queue_mapping = skb->queue_mapping;