2005-12-13 14:50:57

by Olaf Hering

Subject: Re: [PATCH] skge: get rid of warning on race

On Mon, Dec 12, Linux Kernel Mailing List wrote:

> tree 987cfbd2134b82bea55c55fa17bd70d29df70458
> parent 0e670506668a43e1355b8f10c33d081a676bd521
> author Stephen Hemminger <[email protected]> Wed, 07 Dec 2005 07:01:49 -0800
> committer Jeff Garzik <[email protected]> Tue, 13 Dec 2005 09:33:03 -0500
>
> [PATCH] skge: get rid of warning on race

> drivers/net/skge.c | 10 ++++++----

> - netif_stop_queue(dev);
> - spin_unlock_irqrestore(&skge->tx_lock, flags);
> + if (!netif_stopped(dev)) {
> + netif_stop_queue(dev);

Current Linus tree does not compile:

drivers/net/skge.c:2283: error: implicit declaration of function 'netif_stopped'


--
short story of a lazy sysadmin:
alias appserv=wotan

2005-12-13 15:57:15

by Stephen Hemminger

Subject: Re: [PATCH] skge: get rid of warning on race

On Tue, 13 Dec 2005 15:50:54 +0100
Olaf Hering <[email protected]> wrote:

> On Mon, Dec 12, Linux Kernel Mailing List wrote:
>
> > tree 987cfbd2134b82bea55c55fa17bd70d29df70458
> > parent 0e670506668a43e1355b8f10c33d081a676bd521
> > author Stephen Hemminger <[email protected]> Wed, 07 Dec 2005 07:01:49 -0800
> > committer Jeff Garzik <[email protected]> Tue, 13 Dec 2005 09:33:03 -0500
> >
> > [PATCH] skge: get rid of warning on race
>
> > drivers/net/skge.c | 10 ++++++----
>
> > - netif_stop_queue(dev);
> > - spin_unlock_irqrestore(&skge->tx_lock, flags);
> > + if (!netif_stopped(dev)) {
> > + netif_stop_queue(dev);
>
> Current Linus tree does not compile:
>
> drivers/net/skge.c:2283: error: implicit declaration of function 'netif_stopped'

Should have been netif_queue_stopped..

Index: skge-2.6/drivers/net/skge.c
===================================================================
--- skge-2.6.orig/drivers/net/skge.c
+++ skge-2.6/drivers/net/skge.c
@@ -2280,7 +2280,7 @@ static int skge_xmit_frame(struct sk_buf
}

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",