Skip to contentSkip to conversation

staging/sxg: fix napi interface build

PATCH Applied Randy Dunlap 4 participants 6 messages Feb 11, 2009 – Feb 13, 2009 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 9/9 staging/sxg: fix napi interface build

From: Randy Dunlap <[email protected]>

Fix staging/sxg napi interface calls:

drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep' linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule' drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'

---
 drivers/staging/sxg/sxg.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/sxg/sxg.c +3 -3
@@ -1268,8 +1268,8 @@ static void sxg_interrupt(struct adapter
 {
 	WRITE_REG(adapter->UcodeRegs[0].Icr, SXG_ICR(0, SXG_ICR_MASK), TRUE);
 
-	if (netif_rx_schedule_prep(&adapter->napi)) {
-		__netif_rx_schedule(&adapter->napi);
+	if (napi_schedule_prep(&adapter->napi)) {
+		__napi_schedule(&adapter->napi);
 	}
 }
 
@@ -1322,7 +1322,7 @@ static int sxg_poll(struct napi_struct *
 	sxg_handle_interrupt(adapter, &work_done, budget);
 
 	if (work_done < budget) {
-		netif_rx_complete(napi);
+		napi_complete(napi);
 		WRITE_REG(adapter->UcodeRegs[0].Isr, 0, TRUE);
 	}
 	return work_done;
#1 lore raw
Quoted 7 lines · Randy Dunlap

From: Randy Dunlap <[email protected]>

Fix staging/sxg napi interface calls:

drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep' linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule' drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'

As I count over 80 instances of netif_rx_complete in Linus's tree right now, I'm guesing this is due to a change from the netdev tree. Which is fine, but I'll wait until that gets merged with Linus to apply this patch.

thanks,

greg k-h

#2 lore raw

From: Greg KH <[email protected]>
Date: Thu, 12 Feb 2009 11:51:33 -0800

Quoted 5 lines · Randy Dunlap
Quoted 4 lines

From: Randy Dunlap <[email protected]>

Fix staging/sxg napi interface calls:

Quoted 8 lines
Quoted 3 lines

drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep' linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule' drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'

As I count over 80 instances of netif_rx_complete in Linus's tree right now, I'm guesing this is due to a change from the netdev tree. Which is fine, but I'll wait until that gets merged with Linus to apply this patch.

Well it means that it won't build in -next until the next merge window.

#3 lore raw
Quoted 12 lines · David Miller

From: Greg KH <[email protected]>
Date: Thu, 12 Feb 2009 11:51:33 -0800

Quoted 9 lines · Randy Dunlap
Quoted 7 lines

From: Randy Dunlap <[email protected]>

Fix staging/sxg napi interface calls:

drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep' linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule' drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'

Quoted 7 lines
Quoted 4 lines

As I count over 80 instances of netif_rx_complete in Linus's tree right now, I'm guesing this is due to a change from the netdev tree. Which is fine, but I'll wait until that gets merged with Linus to apply this patch.

Well it means that it won't build in -next until the next merge window.

I can live with that :)

Or is the new api already there and it's safe to make this change now?

thanks,

greg k-h

#4 lore raw

From: Greg KH <[email protected]>
Date: Thu, 12 Feb 2009 15:08:46 -0800

Quoted 18 lines · David Miller
Quoted 17 lines

From: Greg KH <[email protected]>
Date: Thu, 12 Feb 2009 11:51:33 -0800

Quoted 13 lines · Randy Dunlap
Quoted 7 lines

From: Randy Dunlap <[email protected]>

Fix staging/sxg napi interface calls:

drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep' linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule' drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'

As I count over 80 instances of netif_rx_complete in Linus's tree right now, I'm guesing this is due to a change from the netdev tree. Which is fine, but I'll wait until that gets merged with Linus to apply this patch.

Quoted 6 lines
Quoted 2 lines

Well it means that it won't build in -next until the next merge window.

I can live with that :)

Or is the new api already there and it's safe to make this change now?

If you make the change, your driver will build in Linus's tree. Just sed 's/netif_rx_/napi_/' for the lines the above warning triggers on.

#5 lore raw
Quoted 24 lines · David Miller

From: Greg KH <[email protected]>
Date: Thu, 12 Feb 2009 15:08:46 -0800

Quoted 21 lines · David Miller
Quoted 19 lines

From: Greg KH <[email protected]>
Date: Thu, 12 Feb 2009 11:51:33 -0800

Quoted 5 lines · Randy Dunlap
Quoted 4 lines

From: Randy Dunlap <[email protected]>

Fix staging/sxg napi interface calls:

Quoted 8 lines
Quoted 3 lines

drivers/staging/sxg/sxg.c:1271: error: implicit declaration of function 'netif_rx_schedule_prep' linux-next-20090209/drivers/staging/sxg/sxg.c:1272: error: implicit declaration of function '__netif_rx_schedule' drivers/staging/sxg/sxg.c:1325: error: implicit declaration of function 'netif_rx_complete'

As I count over 80 instances of netif_rx_complete in Linus's tree right now, I'm guesing this is due to a change from the netdev tree. Which is fine, but I'll wait until that gets merged with Linus to apply this patch.

Well it means that it won't build in -next until the next merge window.

Quoted 7 lines
Quoted 3 lines

I can live with that :)

Or is the new api already there and it's safe to make this change now?

If you make the change, your driver will build in Linus's tree. Just sed 's/netif_rx_/napi_/' for the lines the above warning triggers on.

Ah, sorry, didn't realize that. I'll go apply the patch now, sorry for the noise...

greg k-h