rpms/kernel/F-9 linux-2.6-netdev-atl2-2.0.5-update.patch, NONE, 1.1.2.1 patch-2.6.27.24.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.837.2.13, 1.837.2.14 kernel.spec, 1.891.2.50, 1.891.2.51 sources, 1.798.2.13, 1.798.2.14 upstream, 1.717.2.13, 1.717.2.14 cifs-fix-unicode-string-area-word-alignment-2.6.27.patch, 1.1.2.1, NONE patch-2.6.27.23.bz2.sign, 1.1.2.1, NONE

Chuck Ebbert cebbert at fedoraproject.org
Wed May 20 08:50:19 UTC 2009


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11990

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	.cvsignore kernel.spec sources upstream 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-netdev-atl2-2.0.5-update.patch 
	patch-2.6.27.24.bz2.sign 
Removed Files:
      Tag: private-fedora-9-2_6_27-branch
	cifs-fix-unicode-string-area-word-alignment-2.6.27.patch 
	patch-2.6.27.23.bz2.sign 
Log Message:
Linux 2.6.27.24
Dropped patches, merged upstream:
    cifs-fix-unicode-string-area-word-alignment-2.6.27.patch
Update atl2 driver to version 2.0.5

linux-2.6-netdev-atl2-2.0.5-update.patch:

--- NEW FILE linux-2.6-netdev-atl2-2.0.5-update.patch ---
--- a/drivers/net/atl2/atl2_main.c
+++ b/drivers/net/atl2/atl2_main.c
@@ -48,7 +48,7 @@
 
 #include "atl2.h"
 
-#define ATL2_DRV_VERSION "2.0.4"
+#define ATL2_DRV_VERSION "2.0.5"
 
 char atl2_driver_name[] = "atl2";
 static const char atl2_driver_string[] = "Atheros(R) L2 Ethernet Driver";
@@ -918,7 +918,8 @@
 	txs_unused = TxsFreeUnit(adapter);
 	txbuf_unused = TxdFreeBytes(adapter);
 
-	if (txs_unused < 1 || skb->len > txbuf_unused) {
+	if (skb->len + sizeof(tx_pkt_header_t) + 4  > txbuf_unused ||
+		txs_unused < 1 ) {
 		// no enough resource
 		netif_stop_queue(netdev);
 		spin_unlock_irqrestore(&adapter->tx_lock, flags);


--- NEW FILE patch-2.6.27.24.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKE5XJyGugalF9Dw4RApKNAJ9ovMB2CK/yRlM1yvmE+xK5iIojEACcCx4F
mfoDysgL/eLJlhbeg+h6dv0=
=KFvB
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.837.2.13
retrieving revision 1.837.2.14
diff -u -p -r1.837.2.13 -r1.837.2.14
--- .cvsignore	9 May 2009 01:29:12 -0000	1.837.2.13
+++ .cvsignore	20 May 2009 08:49:47 -0000	1.837.2.14
@@ -4,4 +4,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.27
 linux-2.6.27.tar.bz2
-patch-2.6.27.23.bz2
+patch-2.6.27.24.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.50
retrieving revision 1.891.2.51
diff -u -p -r1.891.2.50 -r1.891.2.51
--- kernel.spec	11 May 2009 14:44:10 -0000	1.891.2.50
+++ kernel.spec	20 May 2009 08:49:48 -0000	1.891.2.51
@@ -36,7 +36,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 23
+%define stable_update 24
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -722,6 +722,7 @@ Patch2009: linux-2.6-netdev-r8169-add-mo
 
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
+Patch2021: linux-2.6-netdev-atl2-2.0.5-update.patch
 
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
@@ -754,7 +755,6 @@ Patch2914: ext4.git-5-e0ee7aa0b15299bc67
 Patch3110: linux-2.6-dmi-autoload.patch
 
 Patch4000: kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
-Patch4001: cifs-fix-unicode-string-area-word-alignment-2.6.27.patch
 
 %endif
 
@@ -1324,6 +1324,7 @@ ApplyPatch linux-2.6-netdev-r8169-add-mo
 ApplyPatch linux-2.6-netdev-r8169-convert-to-netdevice-ops-R.patch -R
 
 ApplyPatch linux-2.6-netdev-atl2.patch
+ApplyPatch linux-2.6-netdev-atl2-2.0.5-update.patch
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
@@ -1356,7 +1357,6 @@ fi
 ApplyPatch linux-2.6-merge-efifb-imacfb.patch
 
 ApplyPatch kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
-ApplyPatch cifs-fix-unicode-string-area-word-alignment-2.6.27.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -1961,6 +1961,12 @@ fi
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed May 20 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.24-78.2.51
+- Linux 2.6.27.24
+- Dropped patches, merged upstream:
+    cifs-fix-unicode-string-area-word-alignment-2.6.27.patch
+- Update atl2 driver to version 2.0.5
+
 * Mon May 11 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.23-78.2.50
 - Add stable patch from 2.6.29.1
 - Add stable patch pending in 2.6.29-stable


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.798.2.13
retrieving revision 1.798.2.14
diff -u -p -r1.798.2.13 -r1.798.2.14
--- sources	9 May 2009 01:29:17 -0000	1.798.2.13
+++ sources	20 May 2009 08:49:48 -0000	1.798.2.14
@@ -1,2 +1,2 @@
 b3e78977aa79d3754cb7f8143d7ddabd  linux-2.6.27.tar.bz2
-cbc3fd7041b62892a833af24f6e68efc  patch-2.6.27.23.bz2
+e80fcf73166ec34e54ab7c720cadc925  patch-2.6.27.24.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.717.2.13
retrieving revision 1.717.2.14
diff -u -p -r1.717.2.13 -r1.717.2.14
--- upstream	9 May 2009 01:29:17 -0000	1.717.2.13
+++ upstream	20 May 2009 08:49:48 -0000	1.717.2.14
@@ -1,2 +1,2 @@
 linux-2.6.27.tar.bz2
-patch-2.6.27.23.bz2
+patch-2.6.27.24.bz2


--- cifs-fix-unicode-string-area-word-alignment-2.6.27.patch DELETED ---


--- patch-2.6.27.23.bz2.sign DELETED ---




More information about the scm-commits mailing list