Author: hawk Date: Wed Jul 25 07:46:44 2007 GMT
Module: SOURCES Tag: hawk-LINUX_2_6
---- Log message:
- regenerated for 2.6.22.1
---- Files affected:
SOURCES:
linux-2.6-sk98lin.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-sk98lin.patch
diff -u SOURCES/linux-2.6-sk98lin.patch:1.1.2.1
SOURCES/linux-2.6-sk98lin.patch:1.1.2.2
--- SOURCES/linux-2.6-sk98lin.patch:1.1.2.1 Sat Jun 23 23:49:58 2007
+++ SOURCES/linux-2.6-sk98lin.patch Wed Jul 25 09:46:39 2007
@@ -1,5 +1,5 @@
diff -ruN linux/drivers/net/sk98lin/h/lm80.h
linux-new/drivers/net/sk98lin/h/lm80.h
---- linux/drivers/net/sk98lin/h/lm80.h 2007-04-26 05:08:32.000000000 +0200
+--- linux/drivers/net/sk98lin/h/lm80.h 2007-07-09 01:32:17.000000000 +0200
+++ linux-new/drivers/net/sk98lin/h/lm80.h 2007-03-12 13:44:14.000000000
+0100
@@ -2,8 +2,8 @@
*
@@ -100,9 +100,8 @@
+ *
+ * History:
+ * $Log$
-+ * Revision 1.1.2.1 2007/06/23 21:49:58 hawk
-+ * - patch updating drivers for Marvell gigabit ethernet adapters to official
-+ * ones (version 10.0.5.3)
++ * Revision 1.1.2.2 2007/07/25 07:46:39 hawk
++ * - regenerated for 2.6.22.1
+ *
+ * Revision 1.1.2.5 2007/02/06 14:14:20 malthoff
+ * Add defines for low power settings wiht HW WOL.
@@ -4838,7 +4837,7 @@
+
+#endif /* __INC_SKY3HW_H */
diff -ruN linux/drivers/net/sk98lin/h/skaddr.h
linux-new/drivers/net/sk98lin/h/skaddr.h
---- linux/drivers/net/sk98lin/h/skaddr.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skaddr.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skaddr.h 2007-03-12 13:29:55.000000000
+0100
@@ -2,14 +2,15 @@
*
@@ -4947,7 +4946,7 @@
extern int SkAddrSwap(
SK_AC *pAC,
diff -ruN linux/drivers/net/sk98lin/h/skcsum.h
linux-new/drivers/net/sk98lin/h/skcsum.h
---- linux/drivers/net/sk98lin/h/skcsum.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skcsum.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skcsum.h 2007-03-12 13:44:14.000000000
+0100
@@ -2,14 +2,15 @@
*
@@ -5039,7 +5038,7 @@
extern void SkCsSetReceiveFlags(
SK_AC *pAc,
diff -ruN linux/drivers/net/sk98lin/h/skdebug.h
linux-new/drivers/net/sk98lin/h/skdebug.h
---- linux/drivers/net/sk98lin/h/skdebug.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skdebug.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skdebug.h 2007-03-12 13:44:14.000000000
+0100
@@ -2,23 +2,24 @@
*
@@ -5112,7 +5111,7 @@
/* Debug events */
diff -ruN linux/drivers/net/sk98lin/h/skdrv1st.h
linux-new/drivers/net/sk98lin/h/skdrv1st.h
---- linux/drivers/net/sk98lin/h/skdrv1st.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skdrv1st.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skdrv1st.h 2007-03-12 13:44:21.000000000
+0100
@@ -2,8 +2,8 @@
*
@@ -5231,7 +5230,7 @@
+ *
+
******************************************************************************/
diff -ruN linux/drivers/net/sk98lin/h/skdrv2nd.h
linux-new/drivers/net/sk98lin/h/skdrv2nd.h
---- linux/drivers/net/sk98lin/h/skdrv2nd.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skdrv2nd.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skdrv2nd.h 2007-03-12 13:44:21.000000000
+0100
@@ -1,17 +1,17 @@
/******************************************************************************
@@ -6386,7 +6385,7 @@
+
******************************************************************************/
diff -ruN linux/drivers/net/sk98lin/h/skerror.h
linux-new/drivers/net/sk98lin/h/skerror.h
---- linux/drivers/net/sk98lin/h/skerror.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skerror.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skerror.h 2007-03-12 13:44:14.000000000
+0100
@@ -2,23 +2,24 @@
*
@@ -7193,7 +7192,7 @@
+
+#endif /* _INC_SKGEASF_H_ */
diff -ruN linux/drivers/net/sk98lin/h/skgedrv.h
linux-new/drivers/net/sk98lin/h/skgedrv.h
---- linux/drivers/net/sk98lin/h/skgedrv.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skgedrv.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skgedrv.h 2007-03-12 13:44:14.000000000
+0100
@@ -2,23 +2,24 @@
*
@@ -7249,7 +7248,7 @@
+#define SK_DRV_PRIVATE_BASE 100 /* Base for driver private
events */
#endif /* __INC_SKGEDRV_H_ */
diff -ruN linux/drivers/net/sk98lin/h/skgehw.h
linux-new/drivers/net/sk98lin/h/skgehw.h
---- linux/drivers/net/sk98lin/h/skgehw.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skgehw.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skgehw.h 2007-03-12 13:44:14.000000000
+0100
@@ -2,23 +2,24 @@
*
@@ -10041,7 +10040,7 @@
#endif /* __INC_SKGEHW_H */
+
diff -ruN linux/drivers/net/sk98lin/h/skgehwt.h
linux-new/drivers/net/sk98lin/h/skgehwt.h
---- linux/drivers/net/sk98lin/h/skgehwt.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skgehwt.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skgehwt.h 2007-03-12 13:44:14.000000000
+0100
@@ -2,14 +2,15 @@
*
@@ -10070,7 +10069,7 @@
******************************************************************************/
diff -ruN linux/drivers/net/sk98lin/h/skgei2c.h
linux-new/drivers/net/sk98lin/h/skgei2c.h
---- linux/drivers/net/sk98lin/h/skgei2c.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skgei2c.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skgei2c.h 1970-01-01 01:00:00.000000000
+0100
@@ -1,210 +0,0 @@
-/******************************************************************************
@@ -10284,7 +10283,7 @@
-extern int SkLm80ReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
-#endif /* n_INC_SKGEI2C_H */
diff -ruN linux/drivers/net/sk98lin/h/skgeinit.h
linux-new/drivers/net/sk98lin/h/skgeinit.h
---- linux/drivers/net/sk98lin/h/skgeinit.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skgeinit.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skgeinit.h 2007-03-12 13:44:15.000000000
+0100
@@ -2,23 +2,24 @@
*
@@ -11203,7 +11202,7 @@
-#endif /* __INC_SKGEINIT_H_ */
diff -ruN linux/drivers/net/sk98lin/h/skgepnm2.h
linux-new/drivers/net/sk98lin/h/skgepnm2.h
---- linux/drivers/net/sk98lin/h/skgepnm2.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skgepnm2.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skgepnm2.h 2007-03-12 13:44:15.000000000
+0100
@@ -1,17 +1,18 @@
/*****************************************************************************
@@ -11308,7 +11307,7 @@
#else /* !DEBUG */
diff -ruN linux/drivers/net/sk98lin/h/skgepnmi.h
linux-new/drivers/net/sk98lin/h/skgepnmi.h
---- linux/drivers/net/sk98lin/h/skgepnmi.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skgepnmi.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skgepnmi.h 2007-03-12 13:44:15.000000000
+0100
@@ -1,17 +1,18 @@
/*****************************************************************************
@@ -11707,7 +11706,7 @@
unsigned int *pLen, SK_U32 Instance, SK_U32 NetIndex);
extern int SkPnmiGetStruct(SK_AC *pAC, SK_IOC IoC, void* pBuf,
diff -ruN linux/drivers/net/sk98lin/h/skgesirq.h
linux-new/drivers/net/sk98lin/h/skgesirq.h
---- linux/drivers/net/sk98lin/h/skgesirq.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skgesirq.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skgesirq.h 2007-03-12 13:44:15.000000000
+0100
@@ -2,23 +2,24 @@
*
@@ -12314,7 +12313,7 @@
+#endif /* n_INC_SKGETWSI_H */
+
diff -ruN linux/drivers/net/sk98lin/h/ski2c.h
linux-new/drivers/net/sk98lin/h/ski2c.h
---- linux/drivers/net/sk98lin/h/ski2c.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/ski2c.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/ski2c.h 1970-01-01 01:00:00.000000000
+0100
@@ -1,174 +0,0 @@
-/******************************************************************************
@@ -12631,7 +12630,7 @@
+ { 0, }
+};
diff -ruN linux/drivers/net/sk98lin/h/skqueue.h
linux-new/drivers/net/sk98lin/h/skqueue.h
---- linux/drivers/net/sk98lin/h/skqueue.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skqueue.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skqueue.h 2007-03-12 13:44:15.000000000
+0100
@@ -2,14 +2,15 @@
*
@@ -12682,7 +12681,7 @@
#endif /* _SKQUEUE_H_ */
diff -ruN linux/drivers/net/sk98lin/h/skrlmt.h
linux-new/drivers/net/sk98lin/h/skrlmt.h
---- linux/drivers/net/sk98lin/h/skrlmt.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skrlmt.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skrlmt.h 2007-03-12 13:44:15.000000000
+0100
@@ -2,14 +2,15 @@
*
@@ -12711,7 +12710,7 @@
******************************************************************************/
diff -ruN linux/drivers/net/sk98lin/h/sktimer.h
linux-new/drivers/net/sk98lin/h/sktimer.h
---- linux/drivers/net/sk98lin/h/sktimer.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/sktimer.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/sktimer.h 2007-03-12 13:44:15.000000000
+0100
@@ -2,14 +2,15 @@
*
@@ -12923,7 +12922,7 @@
+#endif /* n_SKTWSI_H */
+
diff -ruN linux/drivers/net/sk98lin/h/sktypes.h
linux-new/drivers/net/sk98lin/h/sktypes.h
---- linux/drivers/net/sk98lin/h/sktypes.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/sktypes.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/sktypes.h 2007-03-12 13:44:16.000000000
+0100
@@ -2,8 +2,8 @@
*
@@ -13015,7 +13014,7 @@
+ *
+
******************************************************************************/
diff -ruN linux/drivers/net/sk98lin/h/skversion.h
linux-new/drivers/net/sk98lin/h/skversion.h
---- linux/drivers/net/sk98lin/h/skversion.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skversion.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skversion.h 2007-03-12
13:44:16.000000000 +0100
@@ -1,17 +1,17 @@
/******************************************************************************
@@ -13072,7 +13071,7 @@
+ *
+
******************************************************************************/
diff -ruN linux/drivers/net/sk98lin/h/skvpd.h
linux-new/drivers/net/sk98lin/h/skvpd.h
---- linux/drivers/net/sk98lin/h/skvpd.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/skvpd.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/skvpd.h 2007-03-12 13:44:16.000000000
+0100
@@ -1,23 +1,25 @@
/******************************************************************************
@@ -14284,7 +14283,7 @@
+#endif /* __INC_SKY2LE_H */
+
diff -ruN linux/drivers/net/sk98lin/h/xmac_ii.h
linux-new/drivers/net/sk98lin/h/xmac_ii.h
---- linux/drivers/net/sk98lin/h/xmac_ii.h 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/h/xmac_ii.h 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/h/xmac_ii.h 2007-03-12 13:44:16.000000000
+0100
@@ -2,23 +2,24 @@
*
@@ -15436,8 +15435,8 @@
#endif /* __INC_XMAC_H */
+
diff -ruN linux/drivers/net/sk98lin/Makefile
linux-new/drivers/net/sk98lin/Makefile
---- linux/drivers/net/sk98lin/Makefile 2007-04-26 05:08:32.000000000 +0200
-+++ linux-new/drivers/net/sk98lin/Makefile 2007-06-23 23:44:46.000000000
+0200
+--- linux/drivers/net/sk98lin/Makefile 2007-07-09 01:32:17.000000000 +0200
++++ linux-new/drivers/net/sk98lin/Makefile 2007-07-25 09:46:30.000000000
+0200
@@ -1,6 +1,71 @@
+#******************************************************************************
#
@@ -15477,9 +15476,8 @@
+# History:
+#
+# $Log$
-+# Revision 1.1.2.1 2007/06/23 21:49:58 hawk
-+# - patch updating drivers for Marvell gigabit ethernet adapters to
official
-+# ones (version 10.0.5.3)
++# Revision 1.1.2.2 2007/07/25 07:46:39 hawk
++# - regenerated for 2.6.22.1
+#
+# Revision 1.1.4.3 2006/12/14 15:23:13 mlindner
+# Add: Enable Yukon Extreme. Define SK_EXTREME enabled
@@ -15580,7 +15578,7 @@
-
-
diff -ruN linux/drivers/net/sk98lin/skaddr.c
linux-new/drivers/net/sk98lin/skaddr.c
---- linux/drivers/net/sk98lin/skaddr.c 2007-04-26 05:08:32.000000000 +0200
+--- linux/drivers/net/sk98lin/skaddr.c 2007-07-09 01:32:17.000000000 +0200
+++ linux-new/drivers/net/sk98lin/skaddr.c 2007-03-12 13:44:13.000000000
+0100
@@ -2,16 +2,17 @@
*
@@ -17957,7 +17955,7 @@
+
+#endif /* SK_USE_CSUM */
diff -ruN linux/drivers/net/sk98lin/skdim.c
linux-new/drivers/net/sk98lin/skdim.c
---- linux/drivers/net/sk98lin/skdim.c 2007-04-26 05:08:32.000000000 +0200
+--- linux/drivers/net/sk98lin/skdim.c 2007-07-09 01:32:17.000000000 +0200
+++ linux-new/drivers/net/sk98lin/skdim.c 2007-03-12 13:44:21.000000000
+0100
@@ -1,17 +1,25 @@
/******************************************************************************
@@ -19032,7 +19030,7 @@
+ *
+
******************************************************************************/
diff -ruN linux/drivers/net/sk98lin/skethtool.c
linux-new/drivers/net/sk98lin/skethtool.c
---- linux/drivers/net/sk98lin/skethtool.c 2007-04-26 05:08:32.000000000
+0200
+--- linux/drivers/net/sk98lin/skethtool.c 2007-07-09 01:32:17.000000000
+0200
+++ linux-new/drivers/net/sk98lin/skethtool.c 2007-03-12 13:44:21.000000000
+0100
@@ -2,8 +2,8 @@
*
@@ -27017,7 +27015,7 @@
+#endif /* __cplusplus */
+
diff -ruN linux/drivers/net/sk98lin/skge.c linux-new/drivers/net/sk98lin/skge.c
---- linux/drivers/net/sk98lin/skge.c 2007-04-26 05:08:32.000000000 +0200
+--- linux/drivers/net/sk98lin/skge.c 2007-07-09 01:32:17.000000000 +0200
+++ linux-new/drivers/net/sk98lin/skge.c 2007-03-12 13:30:02.000000000
+0100
@@ -1,32 +1,26 @@
/******************************************************************************
@@ -28224,12 +28222,12 @@
+
+ pci_enable_wake(pdev, 3, 0);
+ pci_enable_wake(pdev, 4, 0);
++
++ SK_OUT8(pAC->IoBase, RX_GMF_CTRL_T, (SK_U8)GMF_RST_CLR);
-/* local variables **********************************************************/
-static uintptr_t TxQueueAddr[SK_MAX_MACS][2] = {{0x680, 0x600},{0x780,
0x700}};
-static uintptr_t RxQueueAddr[SK_MAX_MACS] = {0x400, 0x480};
-+ SK_OUT8(pAC->IoBase, RX_GMF_CTRL_T, (SK_U8)GMF_RST_CLR);
-+
+ /* Set the adapter power state to D0 */
+ SkPciReadCfgWord(pAC, PCI_PM_CTL_STS, &PmCtlSts);
+ PmCtlSts &= ~(PCI_PM_STATE_D3); /* reset all DState bits */
@@ -28239,7 +28237,7 @@
+ /* Reinit the adapter and start the port again */
+ pAC->BoardLevel = SK_INIT_DATA;
+ SkDrvLeaveDiagMode(pAC);
-
++
+ if ((pAC->GIni.GIChipId == CHIP_ID_YUKON_EC) ||
+ (CHIP_ID_YUKON_2(pAC)) ) {
+ pAC->StatusLETable.Done = 0;
@@ -28247,7 +28245,7 @@
+ pAC->StatusLETable.HwPut = 0;
+ SkGeY2InitStatBmu(pAC, pAC->IoBase, &pAC->StatusLETable);
+ }
-+
+
+ return 0;
+}
+
@@ -29504,9 +29502,9 @@
+ SkGeYellowLED(pAC, pAC->IoBase, 1);
SkDimEnableModerationIfNeeded(pAC);
- SkDimDisplayModerationSettings(pAC);
-
-- pAC->GIni.GIValIrqMask &= IRQ_MASK;
-
+- pAC->GIni.GIValIrqMask &= IRQ_MASK;
+
- /* enable Interrupts */
- SK_OUT32(pAC->IoBase, B0_IMSK, pAC->GIni.GIValIrqMask);
- SK_OUT32(pAC->IoBase, B0_HWE_IMSK, IRQ_HWE_MASK);
@@ -29706,10 +29704,10 @@
-#endif
+#ifdef SK_ASF
- netif_stop_queue(dev);
++ netif_stop_queue(dev);
+ netif_carrier_off(dev);
+#else
-+ netif_stop_queue(dev);
+ netif_stop_queue(dev);
+#endif
if (pAC->RlmtNets == 1)
@@ -30071,10 +30069,10 @@
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
-- u16 hdrlen = pMessage->h.raw - pMessage->data;
+- u16 hdrlen = skb_transport_offset(pMessage);
- u16 offset = hdrlen + pMessage->csum_offset;
-
-- if ((pMessage->h.ipiph->protocol == IPPROTO_UDP ) &&
+- if ((ipip_hdr(pMessage)->protocol == IPPROTO_UDP) &&
+#else
+ if (pMessage->ip_summed == CHECKSUM_HW) {
+#endif
@@ -30137,7 +30135,7 @@
*/
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
-- u16 hdrlen = pMessage->h.raw - pMessage->data;
+- u16 hdrlen = skb_transport_offset(pMessage);
- u16 offset = hdrlen + pMessage->csum_offset;
-
- Control = BMU_STFWD;
@@ -30151,7 +30149,7 @@
** opcode for udp is not working in the hardware yet
** (Revision 2.0)
*/
-- if ((pMessage->h.ipiph->protocol == IPPROTO_UDP ) &&
+- if ((ipip_hdr(pMessage)->protocol == IPPROTO_UDP) &&
+ Protocol = ((SK_U8)pMessage->data[C_OFFSET_IPPROTO] & 0xff);
+ if ((Protocol == C_PROTO_ID_UDP) &&
(pAC->GIni.GIChipRev == 0) &&
@@ -30407,7 +30405,7 @@
ReQueueRxBuffer(pAC, pRxPort, pMsg,
pRxd->VDataHigh, pRxd->VDataLow);
-@@ -2122,96 +3731,112 @@
+@@ -2122,95 +3731,112 @@
skb_put(pNewMsg, FrameLength);
PhysAddr = ((SK_U64) pRxd->VDataHigh) << (SK_U64)32;
PhysAddr |= (SK_U64) pRxd->VDataLow;
@@ -30416,7 +30414,7 @@
- (dma_addr_t) PhysAddr,
- FrameLength,
- PCI_DMA_FROMDEVICE);
-- memcpy(pNewMsg->data, pMsg, FrameLength);
+- skb_copy_to_linear_data(pNewMsg, pMsg, FrameLength);
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5)
+ pci_dma_sync_single(pAC->PciDev,
@@ -30546,7 +30544,6 @@
- SK_PNMI_CNT_RX_OCTETS_DELIVERED(pAC,
- FrameLength, pRxPort->PortIndex);
-
-- pMsg->dev = pAC->dev[pRxPort->PortIndex];
- pMsg->protocol = eth_type_trans(pMsg,
- pAC->dev[pRxPort->PortIndex]);
- netif_rx(pMsg);
@@ -30578,7 +30575,7 @@
pRlmtMbuf = SkDrvAllocRlmtMbuf(pAC,
pAC->IoBase, FrameLength);
if (pRlmtMbuf != NULL) {
-@@ -2239,32 +3864,26 @@
+@@ -2238,31 +3864,26 @@
}
SK_DBG_MSG(NULL, SK_DBGMOD_DRV,
@@ -30590,7 +30587,6 @@
- (IFF_PROMISC | IFF_ALLMULTI)) != 0 ||
- (ForRlmt & SK_RLMT_RX_PROTOCOL) ==
- SK_RLMT_RX_PROTOCOL) {
-- pMsg->dev = pAC->dev[pRxPort->PortIndex];
- pMsg->protocol = eth_type_trans(pMsg,
- pAC->dev[pRxPort->PortIndex]);
+ if ((pAC->dev[PortIndex]->flags & (IFF_PROMISC |
IFF_ALLMULTI)) ||
@@ -30623,7 +30619,7 @@
return;
rx_failed:
-@@ -2278,7 +3897,7 @@
+@@ -2276,7 +3897,7 @@
PhysAddr |= (SK_U64) pRxd->VDataLow;
pci_unmap_page(pAC->PciDev,
PhysAddr,
@@ -30632,7 +30628,7 @@
PCI_DMA_FROMDEVICE);
DEV_KFREE_SKB_IRQ(pRxd->pMBuf);
pRxd->pMBuf = NULL;
-@@ -2288,49 +3907,6 @@
+@@ -2286,49 +3907,6 @@
} /* ReceiveIrq */
@@ -30682,7 +30678,7 @@
/*****************************************************************************
*
* ClearRxRing - remove all buffers from the receive ring
-@@ -2361,7 +3937,7 @@
+@@ -2359,7 +3937,7 @@
PhysAddr |= (SK_U64) pRxd->VDataLow;
pci_unmap_page(pAC->PciDev,
PhysAddr,
@@ -30691,7 +30687,7 @@
PCI_DMA_FROMDEVICE);
DEV_KFREE_SKB(pRxd->pMBuf);
pRxd->pMBuf = NULL;
-@@ -2419,31 +3995,32 @@
+@@ -2417,31 +3995,32 @@
static int SkGeSetMacAddr(struct SK_NET_DEVICE *dev, void *p)
{
@@ -30731,7 +30727,7 @@
return 0;
} /* SkGeSetMacAddr */
-@@ -2476,7 +4053,7 @@
+@@ -2474,7 +4053,7 @@
SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
("SkGeSetRxMode starts now... "));
@@ -30740,7 +30736,7 @@
pAC = pNet->pAC;
if (pAC->RlmtNets == 1)
PortIdx = pAC->ActivePort;
-@@ -2525,6 +4102,45 @@
+@@ -2523,6 +4102,45 @@
/*****************************************************************************
*
@@ -30786,7 +30782,7 @@
* SkGeChangeMtu - set the MTU to another value
*
* Description:
-@@ -2538,28 +4154,32 @@
+@@ -2536,28 +4154,32 @@
*/
static int SkGeChangeMtu(struct SK_NET_DEVICE *dev, int NewMtu)
{
@@ -30828,14 +30824,14 @@
if (pAC->DiagModeActive == DIAG_ACTIVE) {
if (pAC->DiagFlowCtrl == SK_FALSE) {
return -1; /* still in use, deny any actions of MTU */
-@@ -2567,201 +4187,84 @@
+@@ -2565,201 +4187,84 @@
pAC->DiagFlowCtrl = SK_FALSE;
}
}
-#endif
-
-- pOtherDev = pAC->dev[1 - pNet->NetNr];
-
+- pOtherDev = pAC->dev[1 - pNet->NetNr];
+
- if ( netif_running(pOtherDev) && (pOtherDev->mtu > 1500)
- && (NewMtu <= 1500))
- return 0;
@@ -31084,7 +31080,7 @@
/*****************************************************************************
-@@ -2777,125 +4280,67 @@
+@@ -2775,125 +4280,67 @@
*/
static struct net_device_stats *SkGeStats(struct SK_NET_DEVICE *dev)
{
@@ -31263,7 +31259,7 @@
/*****************************************************************************
*
* SkGeIoctl - IO-control function
-@@ -2903,41 +4348,43 @@
+@@ -2901,41 +4348,43 @@
* Description:
* This function is called if an ioctl is issued on the device.
* There are three subfunction for reading, writing and test-writing
@@ -31328,7 +31324,7 @@
if (!capable(CAP_NET_ADMIN)) return -EPERM;
case SK_IOCTL_GETMIB:
if(copy_from_user(&pAC->PnmiStruct, Ioctl.pData,
-@@ -2964,6 +4411,7 @@
+@@ -2962,6 +4411,7 @@
if (NULL == (pMemBuf = kmalloc(Length, GFP_KERNEL))) {
return -ENOMEM;
}
@@ -31336,7 +31332,7 @@
if(copy_from_user(pMemBuf, Ioctl.pData, Length)) {
Err = -EFAULT;
goto fault_gen;
-@@ -2982,10 +4430,10 @@
+@@ -2980,10 +4430,10 @@
goto fault_gen;
}
fault_gen:
@@ -31349,7 +31345,7 @@
if (!capable(CAP_NET_ADMIN)) return -EPERM;
if (Ioctl.Len < (sizeof(pAC->PnmiStruct) + HeaderLength)) {
Length = Ioctl.Len;
-@@ -3022,7 +4470,6 @@
+@@ -3020,7 +4470,6 @@
fault_diag:
kfree(pMemBuf); /* cleanup everything */
break;
@@ -31357,7 +31353,7 @@
default:
Err = -EOPNOTSUPP;
}
-@@ -3054,12 +4501,12 @@
+@@ -3052,12 +4501,12 @@
unsigned int Size, /* length of ioctl data */
int mode) /* flag for set/preset */
{
@@ -31373,7 +31369,7 @@
/* access MIB */
spin_lock_irqsave(&pAC->SlowPathLock, Flags);
switch(mode) {
-@@ -3102,17 +4549,18 @@
+@@ -3100,17 +4549,18 @@
SK_I32 Port; /* preferred port */
SK_BOOL AutoSet;
SK_BOOL DupSet;
@@ -31403,7 +31399,7 @@
/*
* The two parameters AutoNeg. and DuplexCap. map to one configuration
* parameter. The mapping is described by this table:
-@@ -3130,6 +4578,15 @@
+@@ -3128,6 +4578,15 @@
{SK_LMODE_AUTOBOTH , SK_LMODE_AUTOFULL , SK_LMODE_AUTOHALF },
{SK_LMODE_AUTOSENSE, SK_LMODE_AUTOSENSE, SK_LMODE_AUTOSENSE}
};
@@ -31419,7 +31415,7 @@
#define DC_BOTH 0
#define DC_FULL 1
#define DC_HALF 2
-@@ -3162,6 +4619,7 @@
+@@ -3160,6 +4619,7 @@
** ConType DupCap AutoNeg FlowCtrl Role Speed
** ------- ------ ------- -------- ---------- -----
** Auto Both On SymOrRem Auto Auto
@@ -31427,7 +31423,7 @@
** 100FD Full Off None <ignored> 100
** 100HD Half Off None <ignored> 100
** 10FD Full Off None <ignored> 10
-@@ -3169,66 +4627,86 @@
+@@ -3167,66 +4627,86 @@
**
** This ConType parameter is used for all ports of the adapter!
*/
@@ -31535,7 +31531,7 @@
IsConTypeDefined = SK_FALSE; /* No ConType defined */
}
-@@ -3247,14 +4725,30 @@
+@@ -3245,14 +4725,30 @@
} else if (strcmp(Speed_A[pAC->Index],"100")==0) {
LinkSpeed = SK_LSPEED_100MBPS;
} else if (strcmp(Speed_A[pAC->Index],"1000")==0) {
@@ -31568,7 +31564,7 @@
}
/*
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-sk98lin.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
