patch-2.4.23 linux-2.4.23/drivers/net/sk98lin/skcsum.c
Next file: linux-2.4.23/drivers/net/sk98lin/skdim.c
Previous file: linux-2.4.23/drivers/net/sk98lin/skaddr.c
Back to the patch index
Back to the overall index
- Lines: 104
- Date:
2003-11-28 10:26:20.000000000 -0800
- Orig file:
linux-2.4.22/drivers/net/sk98lin/skcsum.c
- Orig date:
2003-06-13 07:51:35.000000000 -0700
diff -urN linux-2.4.22/drivers/net/sk98lin/skcsum.c linux-2.4.23/drivers/net/sk98lin/skcsum.c
@@ -2,15 +2,15 @@
*
* Name: skcsum.c
* Project: GEnesis, PCI Gigabit Ethernet Adapter
- * Version: $Revision: 1.10 $
- * Date: $Date: 2002/04/11 10:02:04 $
+ * Version: $Revision: 1.11 $
+ * Date: $Date: 2003/03/11 14:05:55 $
* Purpose: Store/verify Internet checksum in send/receive packets.
*
******************************************************************************/
/******************************************************************************
*
- * (C)Copyright 1998-2001 SysKonnect GmbH.
+ * (C)Copyright 1998-2003 SysKonnect GmbH.
*
* 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
@@ -26,6 +26,10 @@
* History:
*
* $Log: skcsum.c,v $
+ * Revision 1.11 2003/03/11 14:05:55 rschmidt
+ * Replaced memset() by macro SK_MEMSET()
+ * Editorial changes
+ *
* Revision 1.10 2002/04/11 10:02:04 rwahl
* Fix in SkCsGetSendInfo():
* - function did not return ProtocolFlags in every case.
@@ -73,9 +77,8 @@
#ifdef SK_USE_CSUM /* Check if CSUM is to be used. */
#ifndef lint
-static const char SysKonnectFileId[] = "@(#)"
- "$Id: skcsum.c,v 1.10 2002/04/11 10:02:04 rwahl Exp $"
- " (C) SysKonnect.";
+static const char SysKonnectFileId[] =
+ "@(#) $Id: skcsum.c,v 1.11 2003/03/11 14:05:55 rschmidt Exp $ (C) SysKonnect.";
#endif /* !lint */
/******************************************************************************
@@ -107,8 +110,8 @@
*
* "h/skdrv1st.h"
* "h/skcsum.h"
- * "h/sktypes.h"
- * "h/skqueue.h"
+ * "h/sktypes.h"
+ * "h/skqueue.h"
* "h/skdrv2nd.h"
*
******************************************************************************/
@@ -173,7 +176,7 @@
* little/big endian conversion on little endian machines only.
*/
#ifdef SK_LITTLE_ENDIAN
-#define SKCS_HTON16(Val16) (((unsigned) (Val16) >> 8) | (((Val16) & 0xFF) << 8))
+#define SKCS_HTON16(Val16) (((unsigned) (Val16) >> 8) | (((Val16) & 0xff) << 8))
#endif /* SK_LITTLE_ENDIAN */
#ifdef SK_BIG_ENDIAN
#define SKCS_HTON16(Val16) (Val16)
@@ -204,7 +207,7 @@
* zero.)
*
* Note:
- * There is a bug in the ASIC which may lead to wrong checksums.
+ * There is a bug in the GENESIS ASIC which may lead to wrong checksums.
*
* Arguments:
* pAc - A pointer to the adapter context struct.
@@ -603,7 +606,7 @@
NextLevelProtocol = *(SK_U8 *)
SKCS_IDX(pIpHeader, SKCS_OFS_IP_NEXT_LEVEL_PROTOCOL);
- if (IpHeaderChecksum != 0xFFFF) {
+ if (IpHeaderChecksum != 0xffff) {
pAc->Csum.ProtoStats[NetNumber][SKCS_PROTO_STATS_IP].RxErrCts++;
/* the NDIS tester wants to know the upper level protocol too */
if (NextLevelProtocol == SKCS_PROTO_ID_TCP) {
@@ -721,7 +724,7 @@
/* Check if the TCP/UDP checksum is ok. */
- if ((unsigned) NextLevelProtocolChecksum == 0xFFFF) {
+ if ((unsigned) NextLevelProtocolChecksum == 0xffff) {
/* TCP/UDP checksum ok. */
@@ -903,12 +906,12 @@
NetNumber = (int)Param.Para32[0];
if (ProtoIndex < 0) { /* Clear for all protocols. */
if (NetNumber >= 0) {
- memset(&pAc->Csum.ProtoStats[NetNumber][0], 0,
+ SK_MEMSET(&pAc->Csum.ProtoStats[NetNumber][0], 0,
sizeof(pAc->Csum.ProtoStats[NetNumber]));
}
}
else { /* Clear for individual protocol. */
- memset(&pAc->Csum.ProtoStats[NetNumber][ProtoIndex], 0,
+ SK_MEMSET(&pAc->Csum.ProtoStats[NetNumber][ProtoIndex], 0,
sizeof(pAc->Csum.ProtoStats[NetNumber][ProtoIndex]));
}
break;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)