diff --git a/[refs] b/[refs] index 8d433df1e76d..7affc11bdd2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be0d9b6c7aeaad1683059c00131cabd4c894c17c +refs/heads/master: 98684a9d91bceff829b6dc7adf0f662d59cfa6e3 diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index 8b6e2a11e28d..00d683063c01 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/drivers/net/skge.c @@ -2280,7 +2280,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev) } if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) { - if (!netif_stopped(dev)) { + if (!netif_queue_stopped(dev)) { netif_stop_queue(dev); printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",