SOURCES (LINUX_2_6): linux-2.6-sk98lin-8.36.1.3.patch - 2.6.19 ready

[mguevara]

Author: mguevara                     Date: Tue Dec 12 11:29:22 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- 2.6.19 ready

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

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-sk98lin-8.36.1.3.patch
diff -u SOURCES/linux-2.6-sk98lin-8.36.1.3.patch:1.1.2.3 SOURCES/linux-2.6-sk98lin-8.36.1.3.patch:1.1.2.4
--- SOURCES/linux-2.6-sk98lin-8.36.1.3.patch:1.1.2.3	Fri Sep 22 14:48:06 2006
+++ SOURCES/linux-2.6-sk98lin-8.36.1.3.patch	Tue Dec 12 12:29:16 2006
@@ -40,8 +40,8 @@
 +# History:
 +#
 +#	$Log$
-+#	Revision 1.1.2.3  2006/09/22 12:48:06  baggins
-+#	- fix compilation in 2.6.18 tree
++#	Revision 1.1.2.4  2006/12/12 11:29:16  mguevara
++#	- 2.6.19 ready
 +#	
 +#	Revision 1.9.2.1  2005/04/11 09:01:18  mlindner
 +#	Fix: Copyright year changed
@@ -13641,7 +13641,7 @@
  	return 0;
  }
  
--struct ethtool_ops SkGeEthtoolOps = {
+-const struct ethtool_ops SkGeEthtoolOps = {
 -	.get_settings		= getSettings,
 -	.set_settings		= setSettings,
 -	.get_drvinfo		= getDriverInfo,
@@ -13919,8 +13919,8 @@
  static void	BoardInitMem(SK_AC *pAC);
 -static void	SetupRing(SK_AC*, void*, uintptr_t, RXD**, RXD**, RXD**, int*, SK_BOOL);
 +static void	SetupRing(SK_AC*, void*, uintptr_t, RXD**, RXD**, RXD**, int*, int*, SK_BOOL);
- static SkIsrRetVar	SkGeIsr(int irq, void *dev_id, struct pt_regs *ptregs);
- static SkIsrRetVar	SkGeIsrOnePort(int irq, void *dev_id, struct pt_regs *ptregs);
+ static SkIsrRetVar	SkGeIsr(int irq, void *dev_id);
+ static SkIsrRetVar	SkGeIsrOnePort(int irq, void *dev_id);
  static int	SkGeOpen(struct SK_NET_DEVICE *dev);
 @@ -206,39 +134,76 @@
  static struct	net_device_stats *SkGeStats(struct SK_NET_DEVICE *dev);
@@ -14016,7 +14016,7 @@
 +static const char *BootString = BOOT_STRING;
 +struct SK_NET_DEVICE *SkGeRootDev = NULL;
  static SK_BOOL DoPrintInterfaceChange = SK_TRUE;
--extern  struct ethtool_ops SkGeEthtoolOps;
+-extern const struct ethtool_ops SkGeEthtoolOps;
  
  /* local variables **********************************************************/
  static uintptr_t TxQueueAddr[SK_MAX_MACS][2] = {{0x680, 0x600},{0x780, 0x700}};
@@ -15805,7 +15805,7 @@
 -static void SkGePollController(struct net_device *dev)
 -{
 -	disable_irq(dev->irq);
--	SkGeIsr(dev->irq, dev, NULL);
+-	SkGeIsr(dev->irq, dev);
 -	enable_irq(dev->irq);
 -}
 -#endif
@@ -16323,7 +16323,7 @@
 @@ -1560,10 +2789,8 @@
  	pTxd->pMBuf     = pMessage;
  
- 	if (pMessage->ip_summed == CHECKSUM_HW) {
+ 	if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
 -		u16 hdrlen = pMessage->h.raw - pMessage->data;
 -		u16 offset = hdrlen + pMessage->csum;
 -
@@ -16384,7 +16384,7 @@
 @@ -1679,31 +2913,32 @@
  	** Does the HW need to evaluate checksum for TCP or UDP packets? 
  	*/
- 	if (pMessage->ip_summed == CHECKSUM_HW) {
+ 	if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
 -		u16 hdrlen = pMessage->h.raw - pMessage->data;
 -		u16 offset = hdrlen + pMessage->csum;
 -
@@ -16742,7 +16742,7 @@
 -
 -#ifdef USE_SK_RX_CHECKSUM
 -		pMsg->csum = pRxd->TcpSums & 0xffff;
--		pMsg->ip_summed = CHECKSUM_HW;
+-		pMsg->ip_summed = CHECKSUM_COMPLETE;
 -#else
 -		pMsg->ip_summed = CHECKSUM_NONE;
 -#endif
@@ -19580,7 +19580,7 @@
 -
 -static int __init skge_init(void)
 -{
--	return pci_module_init(&skge_driver);
+-	return pci_register_driver(&skge_driver);
 -}
 -
 -static void __exit skge_exit(void)
================================================================

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