summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@mandrakesoft.com>2002-05-29 18:48:09 -0400
committerJeff Garzik <jgarzik@mandrakesoft.com>2002-05-29 18:48:09 -0400
commit4e130235d92fba4810950c60f9355ee04e3f35f4 (patch)
tree472e1939f47015d9794d2b8e01eebc36c14092d1 /include/linux
parent22775da009ff878e020593ad247d7615e16f6ce8 (diff)
parent1fe7560c060c8fae1d571959e152b3ed455e9d82 (diff)
Merge mandrakesoft.com:/home/jgarzik/vanilla/linus-2.5
into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ethtool.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 6f8ebf32d744..a4af66c7128a 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -4,6 +4,9 @@
* Copyright (C) 1998 David S. Miller (davem@redhat.com)
* Copyright 2001 Jeff Garzik <jgarzik@mandrakesoft.com>
* Portions Copyright 2001 Sun Microsystems (thockin@sun.com)
+ * Portions Copyright 2002 Intel (eli.kupermann@intel.com,
+ * christopher.leech@intel.com,
+ * scott.feldman@intel.com)
*/
#ifndef _LINUX_ETHTOOL_H
@@ -268,6 +271,7 @@ struct ethtool_test {
* (ethtool_value), priv. */
#define ETHTOOL_TEST 0x0000001a /* execute NIC self-test, priv. */
#define ETHTOOL_GSTRINGS 0x0000001b /* get specified string set */
+#define ETHTOOL_PHYS_ID 0x0000001c /* identify the NIC */
/* compatibility with older code */
#define SPARC_ETH_GSET ETHTOOL_GSET