From cb10772449f1642d80c4a311e86f0bb597375ee0 Mon Sep 17 00:00:00 2001 From: Krishna Kumar Date: Thu, 15 Nov 2007 10:35:37 +0530 Subject: [PATCH] --- yaml --- r: 76856 b: refs/heads/master c: 48fe5e594c979177b7f20affd027be56e8ea2767 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 7936e756ee0c..927d0ba5a13e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d68ea32611095c7e09409ac1b2a56da22fd5eb7 +refs/heads/master: 48fe5e594c979177b7f20affd027be56e8ea2767 diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c index d7330451685c..a082466f4a83 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -672,16 +672,6 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev) if (unlikely(!spin_trylock_irqsave(&priv->tx_lock, flags))) return NETDEV_TX_LOCKED; - /* - * Check if our queue is stopped. Since we have the LLTX bit - * set, we can't rely on netif_stop_queue() preventing our - * xmit function from being called with a full queue. - */ - if (unlikely(netif_queue_stopped(dev))) { - spin_unlock_irqrestore(&priv->tx_lock, flags); - return NETDEV_TX_BUSY; - } - if (likely(skb->dst && skb->dst->neighbour)) { if (unlikely(!*to_ipoib_neigh(skb->dst->neighbour))) { ipoib_path_lookup(skb, dev);