rpms/kernel/devel linux-2.6-net-velocity-pktlen.patch, NONE, 1.1 kernel.spec, 1.1583, 1.1584

[Dave Jones]

Author: davej

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-net-velocity-pktlen.patch 
Log Message:
Add patch to possibly fix the pktlen problem on via-velocity.

linux-2.6-net-velocity-pktlen.patch:

--- NEW FILE linux-2.6-net-velocity-pktlen.patch ---

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index b02f7ad..46405e9 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1847,7 +1847,7 @@ static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_
 	 */
 	if (tdinfo->skb_dma) {
 
-		pktlen = (skb->len > ETH_ZLEN ? : ETH_ZLEN);
+		pktlen = (skb->len > ETH_ZLEN ? skb->len : ETH_ZLEN);
 		for (i = 0; i < tdinfo->nskb_dma; i++) {
 #ifdef VELOCITY_ZERO_COPY_SUPPORT
 			pci_unmap_single(vptr->pdev, tdinfo->skb_dma[i], le16_to_cpu(td->tdesc1.len), PCI_DMA_TODEVICE);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1583
retrieving revision 1.1584
diff -u -p -r1.1583 -r1.1584
--- kernel.spec	22 Jun 2009 00:41:22 -0000	1.1583
+++ kernel.spec	22 Jun 2009 03:30:42 -0000	1.1584
@@ -670,6 +670,8 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
 # fs fixes
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
+Patch4000: linux-2.6-net-velocity-pktlen.patch
+
 #snmp fixes
 Patch10000: linux-2.6-missing-rfc2465-stats.patch
 
@@ -1130,6 +1132,8 @@ ApplyPatch linux-2.6-execshield.patch
 # btrfs
 #ApplyPatch linux-2.6-btrfs-experimental-branch.patch
 
+ApplyPatch linux-2.6-net-velocity-pktlen.patch
+
 # USB
 
 # ACPI
@@ -1822,6 +1826,9 @@ fi
 # and build.
 
 %changelog
+* Sun Jun 21 2009 Dave Jones <davej at redhat.com> 2.6.31-0.21.rc0.git18
+- Add patch to possibly fix the pktlen problem on via-velocity.
+
 * Sun Jun 21 2009 Dave Jones <davej at redhat.com> 2.6.31-0.20.rc0.git18
 - 2.6.30-git18
   VIA crypto & mmc patches now upstream.