patch-2.4.25 linux-2.4.25/drivers/net/sk98lin/h/skdrv1st.h
Next file: linux-2.4.25/drivers/net/sk98lin/h/skdrv2nd.h
Previous file: linux-2.4.25/drivers/net/sk98lin/h/skcsum.h
Back to the patch index
Back to the overall index
- Lines: 62
- Date:
2004-02-18 05:36:31.000000000 -0800
- Orig file:
linux-2.4.24/drivers/net/sk98lin/h/skdrv1st.h
- Orig date:
2003-11-28 10:26:20.000000000 -0800
diff -urN linux-2.4.24/drivers/net/sk98lin/h/skdrv1st.h linux-2.4.25/drivers/net/sk98lin/h/skdrv1st.h
@@ -2,15 +2,16 @@
*
* Name: skdrv1st.h
* Project: GEnesis, PCI Gigabit Ethernet Adapter
- * Version: $Revision: 1.1 $
- * Date: $Date: 2003/07/21 07:22:43 $
+ * Version: $Revision: 1.4 $
+ * Date: $Date: 2003/11/12 14:28:14 $
* Purpose: First header file for driver and all other modules
*
******************************************************************************/
/******************************************************************************
*
- * (C)Copyright 1998-2003 SysKonnect GmbH.
+ * (C)Copyright 1998-2002 SysKonnect GmbH.
+ * (C)Copyright 2002-2003 Marvell.
*
* 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 +27,15 @@
* History:
*
* $Log: skdrv1st.h,v $
+ * Revision 1.4 2003/11/12 14:28:14 rroesler
+ * Fix: use dedicated ip_fast_csum() on X86_64 systems
+ *
+ * Revision 1.3 2003/10/07 08:16:52 mlindner
+ * Fix: Copyright changes
+ *
+ * Revision 1.2 2003/09/29 12:05:59 mlindner
+ * Fix: Added define SK_CS_CALCULSTE_CHECKSUM
+ *
* Revision 1.1 2003/07/21 07:22:43 rroesler
* Fix: Re-Enter after CVS crash
*
@@ -127,11 +137,8 @@
#define SK_PNMI_READ_U32(p,v) memcpy((char*)&(v),(char*)(p),4)
#define SK_PNMI_READ_U64(p,v) memcpy((char*)&(v),(char*)(p),8)
-#define SkCsCalculateChecksum(p,l) ((~ip_compute_csum(p, l)) & 0xffff)
-
#define SK_ADDR_EQUAL(a1,a2) (!memcmp(a1,a2,6))
-
#if !defined(__OPTIMIZE__) || !defined(__KERNEL__)
#warning You must compile this file with the correct options!
#warning See the last lines of the source file.
@@ -158,6 +165,13 @@
#include <asm/uaccess.h>
#include <net/checksum.h>
+#define SK_CS_CALCULATE_CHECKSUM
+#ifndef CONFIG_X86_64
+#define SkCsCalculateChecksum(p,l) ((~ip_compute_csum(p, l)) & 0xffff)
+#else
+#define SkCsCalculateChecksum(p,l) ((~ip_fast_csum(p, l)) & 0xffff)
+#endif
+
#include "h/sktypes.h"
#include "h/skerror.h"
#include "h/skdebug.h"
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)