SOURCES (hawk-LINUX_2_6): linux-2.6-sk98lin.patch - adjusted for 2...

hawk hawk at pld-linux.org
Wed Jul 25 11:32:15 CEST 2007


Author: hawk                         Date: Wed Jul 25 09:32:15 2007 GMT
Module: SOURCES                       Tag: hawk-LINUX_2_6
---- Log message:
- adjusted for 2.6.22.1, it should build now

---- Files affected:
SOURCES:
   linux-2.6-sk98lin.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-sk98lin.patch
diff -u SOURCES/linux-2.6-sk98lin.patch:1.1.2.2 SOURCES/linux-2.6-sk98lin.patch:1.1.2.3
--- SOURCES/linux-2.6-sk98lin.patch:1.1.2.2	Wed Jul 25 09:46:39 2007
+++ SOURCES/linux-2.6-sk98lin.patch	Wed Jul 25 11:32:10 2007
@@ -100,8 +100,8 @@
 + *
 + * History:
 + * $Log$
-+ * Revision 1.1.2.2  2007/07/25 07:46:39  hawk
-+ * - regenerated for 2.6.22.1
++ * Revision 1.1.2.3  2007/07/25 09:32:10  hawk
++ * - adjusted for 2.6.22.1, it should build now
 + *
 + * Revision 1.1.2.5  2007/02/06 14:14:20  malthoff
 + * Add defines for low power settings wiht HW WOL.
@@ -15476,8 +15476,8 @@
 +# History:
 +#
 +#	$Log$
-+#	Revision 1.1.2.2  2007/07/25 07:46:39  hawk
-+#	- regenerated for 2.6.22.1
++#	Revision 1.1.2.3  2007/07/25 09:32:10  hawk
++#	- adjusted for 2.6.22.1, it should build now
 +#	
 +#	Revision 1.1.4.3  2006/12/14 15:23:13  mlindner
 +#	Add: Enable Yukon Extreme. Define SK_EXTREME enabled
@@ -28853,9 +28853,9 @@
 -		return -EIO;
 +	if (!CHIP_ID_YUKON_2(pAC)) {
 +		if (pAC->GIni.GIMacsFound == 2) {
-+			Ret = request_irq(dev->irq, SkGeIsr, SA_SHIRQ, dev->name, dev);
++			Ret = request_irq(dev->irq, SkGeIsr, IRQF_SHARED, dev->name, dev);
 +		} else if (pAC->GIni.GIMacsFound == 1) {
-+			Ret = request_irq(dev->irq, SkGeIsrOnePort, SA_SHIRQ, dev->name, dev);
++			Ret = request_irq(dev->irq, SkGeIsrOnePort, IRQF_SHARED, dev->name, dev);
 +		} else {
 +			printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
 +				pAC->GIni.GIMacsFound);
@@ -28863,7 +28863,7 @@
 +		}
 +	}
 +	else {
-+		Ret = request_irq(dev->irq, SkY2Isr, SA_SHIRQ, dev->name, dev);
++		Ret = request_irq(dev->irq, SkY2Isr, IRQF_SHARED, dev->name, dev);
  	}
  
  	if (Ret) {
@@ -32913,7 +32913,7 @@
 -#endif
 +static int __init sk98lin_init(void)
 +{
-+	return pci_module_init(&sk98lin_driver);
++	return pci_register_driver(&sk98lin_driver);
 +}
 +
 +static void __exit sk98lin_cleanup(void)
@@ -58772,6 +58772,7 @@
 +#include <linux/tcp.h>
 +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14)
 +#include <linux/ip.h>
++#include <net/ip.h>
 +#endif
 +/******************************************************************************
 + *
@@ -59774,9 +59775,9 @@
 +#ifdef SK_EXTREME
 +				if (!HW_IS_EXT_LE_FORMAT(pAC)) {
 +#endif
-+					TcpOptLen = ((pSkPacket->pMBuf->h.th->doff - 5) * 4);
-+					IpTcpLen  = ((pSkPacket->pMBuf->nh.iph->ihl * 4) + 
-+						sizeof(struct tcphdr));
++					TcpOptLen = tcp_optlen(pSkPacket->pMBuf);
++					IpTcpLen  = ip_hdrlen(pSkPacket->pMBuf) + 
++						sizeof(struct tcphdr);
 +					Mss += (TcpOptLen + IpTcpLen + C_LEN_ETHERMAC_HEADER);
 +#ifdef SK_EXTREME
 +				}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-sk98lin.patch?r1=1.1.2.2&r2=1.1.2.3&f=u



More information about the pld-cvs-commit mailing list