rpms/kernel/devel linux-2.6-compile-fixes.patch, 1.38, 1.39 kernel-2.6.spec, 1.1760, 1.1761

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Dec 14 06:58:52 UTC 2005


Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13060

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-compile-fixes.patch 
Log Message:
build fix


linux-2.6-compile-fixes.patch:
 skge.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: linux-2.6-compile-fixes.patch
diff -N linux-2.6-compile-fixes.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-compile-fixes.patch	14 Dec 2005 06:58:48 -0000	1.39
@@ -0,0 +1,11 @@
+--- linux-2.6.14/drivers/net/skge.c~	2005-12-14 01:57:58.000000000 -0500
++++ linux-2.6.14/drivers/net/skge.c	2005-12-14 01:58:11.000000000 -0500
+@@ -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",


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1760
retrieving revision 1.1761
diff -u -r1.1760 -r1.1761
--- kernel-2.6.spec	14 Dec 2005 02:26:27 -0000	1.1760
+++ kernel-2.6.spec	14 Dec 2005 06:58:48 -0000	1.1761
@@ -377,6 +377,7 @@
 Patch10001: linux-2.6-kdump-needs-not-embedded.patch
 Patch10002: linux-2.6-proc-vmcore-needs-not-embedded.patch
 Patch10003: linux-2.6-gcc41.patch
+Patch10004: linux-2.6-compile-fixes.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -868,6 +869,7 @@
 %patch10001 -p1
 %patch10002 -p1
 %patch10003 -p1
+%patch10004 -p1
 
 
 # END OF PATCH APPLICATIONS




More information about the fedora-cvs-commits mailing list