rpms/kernel/devel linux-2.6-compile-fixes.patch,1.180,1.181

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17780

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
compile fixes

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- linux-2.6-compile-fixes.patch	29 Dec 2008 03:54:51 -0000	1.180
+++ linux-2.6-compile-fixes.patch	29 Dec 2008 04:26:34 -0000	1.181
@@ -35,3 +35,41 @@
  						break;
  					}
  				}
+commit c4c9f0183b7c4e97836e8fecbb67898b06c47e78
+Author: Stephen Rothwell <sfr at canb.auug.org.au>
+Date:   Mon Dec 29 10:46:13 2008 +1100
+
+    net: ehea NAPI interface cleanup fix
+    
+    Commit 908a7a16b852ffd618a9127be8d62432182d81b4 ("net: Remove unused
+    netdev arg from some NAPI interfaces") missed two spots.
+    
+    Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
+    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+
+diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
+index 035aa7d..a2f1905 100644
+--- a/drivers/net/ehea/ehea_main.c
++++ b/drivers/net/ehea/ehea_main.c
+@@ -841,7 +841,7 @@ static int ehea_poll(struct napi_struct *napi, int budget)
+ 		if (!cqe && !cqe_skb)
+ 			return rx;
+ 
+-		if (!netif_rx_reschedule(dev, napi))
++		if (!netif_rx_reschedule(napi))
+ 			return rx;
+ 
+ 		cqe_skb = ehea_proc_cqes(pr, EHEA_POLL_MAX_CQES);
+diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
+index 1f055a9..9bc0f17 100644
+--- a/drivers/net/ibmveth.c
++++ b/drivers/net/ibmveth.c
+@@ -1031,7 +1031,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
+ 		netif_rx_complete(napi);
+ 
+ 		if (ibmveth_rxq_pending_buffer(adapter) &&
+-		    netif_rx_reschedule(netdev, napi)) {
++		    netif_rx_reschedule(napi)) {
+ 			lpar_rc = h_vio_signal(adapter->vdev->unit_address,
+ 					       VIO_IRQ_DISABLE);
+ 			goto restart_poll;