SOURCES (Titanium): linux-2.6.24-sk98lin.patch - fixed for 2.6.24

hawk hawk at pld-linux.org
Thu Feb 28 11:37:45 CET 2008


Author: hawk                         Date: Thu Feb 28 10:37:45 2008 GMT
Module: SOURCES                       Tag: Titanium
---- Log message:
- fixed for 2.6.24

---- Files affected:
SOURCES:
   linux-2.6.24-sk98lin.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6.24-sk98lin.patch
diff -u SOURCES/linux-2.6.24-sk98lin.patch:1.1.2.1 SOURCES/linux-2.6.24-sk98lin.patch:1.1.2.2
--- SOURCES/linux-2.6.24-sk98lin.patch:1.1.2.1	Thu Feb 28 11:34:34 2008
+++ SOURCES/linux-2.6.24-sk98lin.patch	Thu Feb 28 11:37:40 2008
@@ -18902,8 +18902,8 @@
 +# History:
 +#
 +#	$Log$
-+#	Revision 1.1.2.1  2008-02-28 10:34:34  hawk
-+#	- vendor driver for Marvell Yukon gigabit adapters, v10.50.1.3
++#	Revision 1.1.2.2  2008-02-28 10:37:40  hawk
++#	- fixed for 2.6.24
 +#
 +#	Revision 1.1.4.3  2006/12/14 15:23:13  mlindner
 +#	Add: Enable Yukon Extreme. Define SK_EXTREME enabled
@@ -33383,7 +33383,7 @@
 +
 diff -urN linux-2.6.24.orig/drivers/net/sk98lin/skge.c linux-2.6.24/drivers/net/sk98lin/skge.c
 --- linux-2.6.24.orig/drivers/net/sk98lin/skge.c	2008-02-28 11:23:42.000000000 +0100
-+++ linux-2.6.24/drivers/net/sk98lin/skge.c	2008-02-28 11:25:13.000000000 +0100
++++ linux-2.6.24/drivers/net/sk98lin/skge.c	2008-02-28 11:30:04.000000000 +0100
 @@ -1,32 +1,26 @@
  /******************************************************************************
   *
@@ -33425,7 +33425,7 @@
   *	This program is free software; you can redistribute it and/or modify
   *	it under the terms of the GNU General Public License as published by
   *	the Free Software Foundation; either version 2 of the License, or
-@@ -38,86 +32,62 @@
+@@ -38,86 +32,66 @@
  
  /******************************************************************************
   *
@@ -33553,10 +33553,14 @@
 +#endif
 +
 +#define ENABLE_FUTURE_ETH
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
++#define		proc_net	init_net.proc_net
++#endif
  
  /*******************************************************************************
   *
-@@ -128,62 +98,15 @@
+@@ -128,62 +102,15 @@
  /* for debuging on x86 only */
  /* #define BREAKPOINT() asm(" int $3"); */
  
@@ -33622,7 +33626,7 @@
  
  
  /*******************************************************************************
-@@ -192,14 +115,39 @@
+@@ -192,14 +119,39 @@
   *
   ******************************************************************************/
  
@@ -33663,7 +33667,7 @@
  static int	SkGeOpen(struct SK_NET_DEVICE *dev);
  static int	SkGeClose(struct SK_NET_DEVICE *dev);
  static int	SkGeXmit(struct sk_buff *skb, struct SK_NET_DEVICE *dev);
-@@ -208,39 +156,105 @@
+@@ -208,39 +160,105 @@
  static struct	net_device_stats *SkGeStats(struct SK_NET_DEVICE *dev);
  static int	SkGeIoctl(struct SK_NET_DEVICE *dev, struct ifreq *rq, int cmd);
  static void	GetConfiguration(SK_AC*);
@@ -33779,7 +33783,7 @@
  
  #ifdef DEBUG
  static void	DumpMsg(struct sk_buff*, char*);
-@@ -249,33 +263,409 @@
+@@ -249,33 +267,408 @@
  #endif
  
  /* global variables *********************************************************/
@@ -33964,7 +33968,6 @@
 +		return -ENODEV;
 +	}
 +
-+	SET_MODULE_OWNER(dev);
 +#ifdef ENABLE_FUTURE_ETH
 +	SET_ETHTOOL_OPS(dev, &sk98lin_ethtool_ops);
 +#endif
@@ -34202,7 +34205,7 @@
  
  /*****************************************************************************
   *
-@@ -284,22 +674,26 @@
+@@ -284,22 +677,26 @@
   * Description:
   *	This function initialize the PCI resources and IO
   *
@@ -34236,7 +34239,7 @@
  
  #ifdef SK_BIG_ENDIAN
  	/*
-@@ -318,18 +712,621 @@
+@@ -318,18 +715,621 @@
  	 * Remap the regs into kernel space.
  	 */
  	pAC->IoBase = ioremap_nocache(dev->mem_start, 0x4000);
@@ -34866,7 +34869,7 @@
  
  
  /*****************************************************************************
-@@ -349,20 +1346,24 @@
+@@ -349,20 +1349,24 @@
  DEV_NET		*pNet;
  SK_AC		*pAC;
  
@@ -34905,7 +34908,7 @@
  	}
  	
  } /* FreeResources */
-@@ -371,6 +1372,8 @@
+@@ -371,6 +1375,8 @@
  MODULE_DESCRIPTION("SysKonnect SK-NET Gigabit Ethernet SK-98xx driver");
  MODULE_LICENSE("GPL");
  
@@ -34914,7 +34917,7 @@
  #ifdef LINK_SPEED_A
  static char *Speed_A[SK_MAX_CARD_PARAM] = LINK_SPEED;
  #else
-@@ -452,9 +1455,12 @@
+@@ -452,9 +1458,12 @@
  static int   IntsPerSec[SK_MAX_CARD_PARAM];
  static char *Moderation[SK_MAX_CARD_PARAM];
  static char *ModerationMask[SK_MAX_CARD_PARAM];
@@ -34929,7 +34932,7 @@
  module_param_array(Speed_A, charp, NULL, 0);
  module_param_array(Speed_B, charp, NULL, 0);
  module_param_array(AutoNeg_A, charp, NULL, 0);
-@@ -471,9 +1477,138 @@
+@@ -471,9 +1480,138 @@
  /* used for interrupt moderation */
  module_param_array(IntsPerSec, int, NULL, 0);
  module_param_array(Moderation, charp, NULL, 0);
@@ -35070,7 +35073,7 @@
  
  /*****************************************************************************
   *
-@@ -491,11 +1626,13 @@
+@@ -491,11 +1629,13 @@
  static int __devinit SkGeBoardInit(struct SK_NET_DEVICE *dev, SK_AC *pAC)
  {
  short	i;
@@ -35085,7 +35088,7 @@
  
  	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
  		("IoBase: %08lX\n", (unsigned long)pAC->IoBase));
-@@ -511,21 +1648,30 @@
+@@ -511,21 +1651,30 @@
  		spin_lock_init(&pAC->TxPort[i][0].TxDesRingLock);
  		spin_lock_init(&pAC->RxPort[i].RxDesRingLock);
  	}
@@ -35123,7 +35126,7 @@
  	}
  	SkI2cInit(  pAC, pAC->IoBase, SK_INIT_DATA);
  	SkEventInit(pAC, pAC->IoBase, SK_INIT_DATA);
-@@ -533,21 +1679,28 @@
+@@ -533,21 +1682,28 @@
  	SkAddrInit( pAC, pAC->IoBase, SK_INIT_DATA);
  	SkRlmtInit( pAC, pAC->IoBase, SK_INIT_DATA);
  	SkTimerInit(pAC, pAC->IoBase, SK_INIT_DATA);
@@ -35157,7 +35160,7 @@
  	}
  	SkI2cInit(  pAC, pAC->IoBase, SK_INIT_IO);
  	SkEventInit(pAC, pAC->IoBase, SK_INIT_IO);
-@@ -555,61 +1708,130 @@
+@@ -555,61 +1711,130 @@
  	SkAddrInit( pAC, pAC->IoBase, SK_INIT_IO);
  	SkRlmtInit( pAC, pAC->IoBase, SK_INIT_IO);
  	SkTimerInit(pAC, pAC->IoBase, SK_INIT_IO);
@@ -35316,7 +35319,7 @@
  
  	return (0);
  } /* SkGeBoardInit */
-@@ -629,7 +1851,8 @@
+@@ -629,7 +1854,8 @@
   *	SK_TRUE, if all memory could be allocated
   *	SK_FALSE, if not
   */
@@ -35326,7 +35329,7 @@
  {
  caddr_t		pDescrMem;	/* pointer to descriptor memory area */
  size_t		AllocLength;	/* length of complete descriptor area */
-@@ -699,16 +1922,20 @@
+@@ -699,16 +1925,20 @@
  
  	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
  		("BoardFreeMem\n"));
@@ -35352,7 +35355,7 @@
  } /* BoardFreeMem */
  
  
-@@ -717,12 +1944,13 @@
+@@ -717,12 +1947,13 @@
   * 	BoardInitMem - initiate the descriptor rings
   *
   * Description:
@@ -35368,7 +35371,7 @@
  {
  int	i;		/* loop counter */
  int	RxDescrSize;	/* the size of a rx descriptor rounded up to alignment*/
-@@ -731,34 +1959,37 @@
+@@ -731,34 +1962,37 @@
  	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
  		("BoardInitMem\n"));
  
@@ -35430,7 +35433,7 @@
  /*****************************************************************************
   *
   * 	SetupRing - create one descriptor ring
-@@ -778,6 +2009,7 @@
+@@ -778,6 +2012,7 @@
  RXD		**ppRingTail,	/* address where the tail should be written */
  RXD		**ppRingPrev,	/* address where the tail should be written */
  int		*pRingFree,	/* address where the # of free descr. goes */
@@ -35438,7 +35441,7 @@
  SK_BOOL		IsTx)		/* flag: is this a tx ring */
  {
  int	i;		/* loop counter */
-@@ -810,7 +2042,7 @@
+@@ -810,7 +2045,7 @@
  		/* set the pointers right */
  		pDescr->VNextRxd = VNextDescr & 0xffffffffULL;
  		pDescr->pNextRxd = pNextDescr;
@@ -35447,7 +35450,7 @@
  
  		/* advance one step */
  		pPrevDescr = pDescr;
-@@ -820,11 +2052,12 @@
+@@ -820,11 +2055,12 @@
  	}
  	pPrevDescr->pNextRxd = (RXD*) pMemArea;
  	pPrevDescr->VNextRxd = VMemArea;
@@ -35465,7 +35468,7 @@
  } /* SetupRing */
  
  
-@@ -882,24 +2115,46 @@
+@@ -882,24 +2118,46 @@
   * Returns: N/A
   *
   */
@@ -35514,7 +35517,7 @@
  	while (((IntSrc & IRQ_MASK) & ~SPECIAL_IRQS) != 0) {
  #if 0 /* software irq currently not used */
  		if (IntSrc & IS_IRQ_SW) {
-@@ -913,6 +2168,7 @@
+@@ -913,6 +2171,7 @@
  				SK_DBGCAT_DRV_INT_SRC,
  				("EOF RX1 IRQ\n"));
  			ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
@@ -35522,7 +35525,7 @@
  			SK_PNMI_CNT_RX_INTR(pAC, 0);
  		}
  		if (IntSrc & IS_R2_F) {
-@@ -920,6 +2176,7 @@
+@@ -920,6 +2179,7 @@
  				SK_DBGCAT_DRV_INT_SRC,
  				("EOF RX2 IRQ\n"));
  			ReceiveIrq(pAC, &pAC->RxPort[1], SK_TRUE);
@@ -35530,7 +35533,7 @@
  			SK_PNMI_CNT_RX_INTR(pAC, 1);
  		}
  #ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
-@@ -927,6 +2184,7 @@
+@@ -927,6 +2187,7 @@
  			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
  				SK_DBGCAT_DRV_INT_SRC,
  				("EOF AS TX1 IRQ\n"));
@@ -35538,7 +35541,7 @@
  			SK_PNMI_CNT_TX_INTR(pAC, 0);
  			spin_lock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
  			FreeTxDescriptors(pAC, &pAC->TxPort[0][TX_PRIO_LOW]);
-@@ -936,6 +2194,7 @@
+@@ -936,6 +2197,7 @@
  			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
  				SK_DBGCAT_DRV_INT_SRC,
  				("EOF AS TX2 IRQ\n"));
@@ -35546,7 +35549,7 @@
  			SK_PNMI_CNT_TX_INTR(pAC, 1);
  			spin_lock(&pAC->TxPort[1][TX_PRIO_LOW].TxDesRingLock);
  			FreeTxDescriptors(pAC, &pAC->TxPort[1][TX_PRIO_LOW]);
-@@ -946,38 +2205,42 @@
+@@ -946,38 +2208,42 @@
  			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
  				SK_DBGCAT_DRV_INT_SRC,
  				("EOF SY TX1 IRQ\n"));
@@ -35602,7 +35605,7 @@
  
  	IntSrc &= pAC->GIni.GIValIrqMask;
  	if ((IntSrc & SPECIAL_IRQS) || pAC->CheckQueue) {
-@@ -990,19 +2253,9 @@
+@@ -990,19 +2256,9 @@
  
  		SkEventDispatcher(pAC, pAC->IoBase);
  		spin_unlock(&pAC->SlowPathLock);
@@ -35624,7 +35627,7 @@
  
  	if (pAC->CheckQueue) {
  		pAC->CheckQueue = SK_FALSE;
-@@ -1014,7 +2267,8 @@
+@@ -1014,7 +2270,8 @@
  	/* IRQ is processed - Enable IRQs again*/
  	SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
  
@@ -35634,7 +35637,7 @@
  } /* SkGeIsr */
  
  
-@@ -1031,24 +2285,44 @@
+@@ -1031,24 +2288,44 @@
   * Returns: N/A
   *
   */
@@ -35681,7 +35684,7 @@
  	while (((IntSrc & IRQ_MASK) & ~SPECIAL_IRQS) != 0) {
  #if 0 /* software irq currently not used */
  		if (IntSrc & IS_IRQ_SW) {
-@@ -1062,6 +2336,7 @@
+@@ -1062,6 +2339,7 @@
  				SK_DBGCAT_DRV_INT_SRC,
  				("EOF RX1 IRQ\n"));
  			ReceiveIrq(pAC, &pAC->RxPort[0], SK_TRUE);
@@ -35689,7 +35692,7 @@
  			SK_PNMI_CNT_RX_INTR(pAC, 0);
  		}
  #ifdef USE_TX_COMPLETE /* only if tx complete interrupt used */
-@@ -1069,6 +2344,7 @@
+@@ -1069,6 +2347,7 @@
  			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
  				SK_DBGCAT_DRV_INT_SRC,
  				("EOF AS TX1 IRQ\n"));
@@ -35697,7 +35700,7 @@
  			SK_PNMI_CNT_TX_INTR(pAC, 0);
  			spin_lock(&pAC->TxPort[0][TX_PRIO_LOW].TxDesRingLock);
  			FreeTxDescriptors(pAC, &pAC->TxPort[0][TX_PRIO_LOW]);
-@@ -1079,25 +2355,27 @@
+@@ -1079,25 +2358,27 @@
  			SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
  				SK_DBGCAT_DRV_INT_SRC,
  				("EOF SY TX1 IRQ\n"));
@@ -35733,7 +35736,7 @@
  	IntSrc &= pAC->GIni.GIValIrqMask;
  	if ((IntSrc & SPECIAL_IRQS) || pAC->CheckQueue) {
  		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_INT_SRC,
-@@ -1109,43 +2387,15 @@
+@@ -1109,43 +2390,15 @@
  
  		SkEventDispatcher(pAC, pAC->IoBase);
  		spin_unlock(&pAC->SlowPathLock);
@@ -35780,7 +35783,7 @@
  
  /****************************************************************************
   *
-@@ -1164,27 +2414,55 @@
+@@ -1164,27 +2417,55 @@
   *	!= 0 on error
   */
  static int SkGeOpen(
@@ -35846,7 +35849,7 @@
  
  	/* Set blink mode */
  	if ((pAC->PciDev->vendor == 0x1186) || (pAC->PciDev->vendor == 0x11ab ))
-@@ -1193,6 +2471,13 @@
+@@ -1193,6 +2474,13 @@
  	if (pAC->BoardLevel == SK_INIT_DATA) {
  		/* level 1 init common modules here */
  		if (SkGeInit(pAC, pAC->IoBase, SK_INIT_IO) != 0) {
@@ -35860,7 +35863,7 @@
  			printk("%s: HWInit (1) failed.\n", pAC->dev[pNet->PortNr]->name);
  			return (-1);
  		}
-@@ -1202,12 +2487,27 @@
+@@ -1202,12 +2490,27 @@
  		SkAddrInit	(pAC, pAC->IoBase, SK_INIT_IO);
  		SkRlmtInit	(pAC, pAC->IoBase, SK_INIT_IO);
  		SkTimerInit	(pAC, pAC->IoBase, SK_INIT_IO);
@@ -35888,7 +35891,7 @@
  			printk("%s: HWInit (2) failed.\n", pAC->dev[pNet->PortNr]->name);
  			return (-1);
  		}
-@@ -1217,47 +2517,186 @@
+@@ -1217,47 +2520,186 @@
  		SkAddrInit	(pAC, pAC->IoBase, SK_INIT_RUN);
  		SkRlmtInit	(pAC, pAC->IoBase, SK_INIT_RUN);
  		SkTimerInit	(pAC, pAC->IoBase, SK_INIT_RUN);
@@ -36099,7 +36102,7 @@
  
  	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
  		("SkGeOpen suceeded\n"));
-@@ -1278,32 +2717,48 @@
+@@ -1278,32 +2720,48 @@
   *	error code - on error
   */
  static int SkGeClose(
@@ -36161,7 +36164,7 @@
  			if (newPtrNet == pNet) {
  				pAC->WasIfUp[0] = SK_FALSE;
  			} else {
-@@ -1314,68 +2769,187 @@
+@@ -1314,68 +2772,187 @@
  			pAC->DiagFlowCtrl = SK_FALSE;
  		}
  	}
@@ -36374,7 +36377,7 @@
  	}
  
  	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
-@@ -1386,6 +2960,13 @@
+@@ -1386,6 +2963,13 @@
  			sizeof(SK_PNMI_STRUCT_DATA));
  
  	pAC->MaxPorts--;
@@ -36388,7 +36391,7 @@
  
  	return (0);
  } /* SkGeClose */
-@@ -1412,7 +2993,7 @@
+@@ -1412,7 +2996,7 @@
  SK_AC		*pAC;
  int			Rc;	/* return code of XmitFrame */
  
@@ -36397,7 +36400,7 @@
  	pAC = pNet->pAC;
  
  	if ((!skb_shinfo(skb)->nr_frags) ||
-@@ -1458,6 +3039,108 @@
+@@ -1458,6 +3042,108 @@
  	return (0);
  } /* SkGeXmit */
  
@@ -36506,7 +36509,7 @@
  
  /*****************************************************************************
   *
-@@ -1482,7 +3165,7 @@
+@@ -1482,7 +3168,7 @@
   *	< 0 - on failure: other problems ( -> return failure to upper layers)
   */
  static int XmitFrame(
@@ -36515,7 +36518,7 @@
  TX_PORT		*pTxPort,	/* pointer to struct of port to send to */
  struct sk_buff	*pMessage)	/* pointer to send-message              */
  {
-@@ -1490,17 +3173,22 @@
+@@ -1490,17 +3176,22 @@
  	TXD		*pOldTxd;
  	unsigned long	 Flags;
  	SK_U64		 PhysAddr;
@@ -36540,7 +36543,7 @@
  		** Maybe free'ing some old one help?
  		*/
  		FreeTxDescriptors(pAC, pTxPort);
-@@ -1527,7 +3215,11 @@
+@@ -1527,7 +3218,11 @@
  	** This is to resolve faulty padding by the HW with 0xaa bytes.
  	*/
  	if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
@@ -36552,7 +36555,7 @@
  			spin_unlock_irqrestore(&pTxPort->TxDesRingLock, Flags);
  			return 0;
  		}
-@@ -1561,11 +3253,13 @@
+@@ -1561,11 +3256,13 @@
  	pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
  	pTxd->pMBuf     = pMessage;
  
@@ -36570,7 +36573,7 @@
  			(pAC->GIni.GIChipRev == 0) &&
  			(pAC->GIni.GIChipId == CHIP_ID_YUKON)) {
  			pTxd->TBControl = BMU_TCP_CHECK;
-@@ -1573,9 +3267,14 @@
+@@ -1573,9 +3270,14 @@
  			pTxd->TBControl = BMU_UDP_CHECK;
  		}
  
@@ -36588,7 +36591,7 @@
  
  		pTxd->TBControl |= BMU_OWN | BMU_STF | 
  				   BMU_SW  | BMU_EOF |
-@@ -1583,7 +3282,7 @@
+@@ -1583,7 +3285,7 @@
  				   BMU_IRQ_EOF |
  #endif
  				   pMessage->len;
@@ -36597,7 +36600,7 @@
  		pTxd->TBControl = BMU_OWN | BMU_STF | BMU_CHECK | 
  				  BMU_SW  | BMU_EOF |
  #ifdef USE_TX_COMPLETE
-@@ -1638,10 +3337,11 @@
+@@ -1638,10 +3340,11 @@
  	TXD		*pTxdLst;
  	int 	 	 CurrFrag;
  	int		 BytesSend;
@@ -36610,7 +36613,7 @@
  
  	spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags);
  #ifndef USE_TX_COMPLETE
-@@ -1664,6 +3364,7 @@
+@@ -1664,6 +3367,7 @@
  	pTxdFst   = pTxd;
  	pTxdLst   = pTxd;
  	BytesSend = 0;
@@ -36618,7 +36621,7 @@
  
  	/* 
  	** Map the first fragment (header) into the DMA-space
-@@ -1680,32 +3381,37 @@
+@@ -1680,32 +3384,37 @@
  	/* 
  	** Does the HW need to evaluate checksum for TCP or UDP packets? 
  	*/
@@ -36671,7 +36674,7 @@
  
  	pTxd = pTxd->pNextTxd;
  	pTxPort->TxdRingFree--;
-@@ -1729,18 +3435,44 @@
+@@ -1729,18 +3438,44 @@
  		pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
  		pTxd->pMBuf     = pMessage;
  		
@@ -36719,7 +36722,7 @@
  		}
  		pTxdLst = pTxd;
  		pTxd    = pTxd->pNextTxd;
-@@ -1894,7 +3626,7 @@
+@@ -1894,7 +3629,7 @@
  SK_U16		Length;		/* data fragment length */
  SK_U64		PhysAddr;	/* physical address of a rx buffer */
  
@@ -36728,7 +36731,7 @@
  	if (pMsgBlock == NULL) {
  		SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
  			SK_DBGCAT_DRV_ENTRY,
-@@ -1908,12 +3640,12 @@
+@@ -1908,12 +3643,12 @@
  	pRxd = pRxPort->pRxdRingTail;
  	pRxPort->pRxdRingTail = pRxd->pNextRxd;
  	pRxPort->RxdRingFree--;
@@ -36743,7 +36746,7 @@
  		PCI_DMA_FROMDEVICE);
  
  	pRxd->VDataLow  = (SK_U32) (PhysAddr & 0xffffffff);
-@@ -1953,7 +3685,7 @@
+@@ -1953,7 +3688,7 @@
  	pRxd = pRxPort->pRxdRingTail;
  	pRxPort->pRxdRingTail = pRxd->pNextRxd;
  	pRxPort->RxdRingFree--;
@@ -36752,7 +36755,7 @@
  
  	pRxd->VDataLow  = PhysLow;
  	pRxd->VDataHigh = PhysHigh;
-@@ -1978,28 +3710,40 @@
+@@ -1978,28 +3713,40 @@
   * Returns:	N/A
   */
  static void ReceiveIrq(
@@ -36815,7 +36818,7 @@
  
  rx_start:	
  	/* do forever; exit if BMU_OWN found */
-@@ -2021,6 +3765,13 @@
+@@ -2021,6 +3768,13 @@
  
  		Control = pRxd->RBControl;
  	
@@ -36829,7 +36832,7 @@
  		/* check if this descriptor is ready */
  		if ((Control & BMU_OWN) != 0) {
  			/* this descriptor is not yet ready */
-@@ -2029,11 +3780,10 @@
+@@ -2029,11 +3783,10 @@
  			FillRxRing(pAC, pRxPort);
  			return;
  		}
@@ -36842,7 +36845,7 @@
  			goto rx_failed;
  		}
  
-@@ -2048,8 +3798,8 @@
+@@ -2048,8 +3801,8 @@
  		FrameStat = pRxd->FrameStat;
  
  		/* check for frame length mismatch */
@@ -36853,7 +36856,7 @@
  		if (pAC->GIni.GIChipId == CHIP_ID_GENESIS) {
  			if (FrameLength != (SK_U32) (FrameStat >> XMR_FS_LEN_SHIFT)) {
  				SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
-@@ -2059,8 +3809,7 @@
+@@ -2059,8 +3812,7 @@
  					(SK_U32) (FrameStat >> XMR_FS_LEN_SHIFT)));
  				goto rx_failed;
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6.24-sk98lin.patch?r1=1.1.2.1&r2=1.1.2.2&f=u



More information about the pld-cvs-commit mailing list