diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-05-31 01:51:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-05-31 01:51:27 -0700 |
| commit | 3f102da8fc4e532e253606d331e71feaa7356266 (patch) | |
| tree | 96ca1d3ad5e1b38eb7050ff1bde86cd7874c6386 /include/linux | |
| parent | 7c165ccf3f9851892880ff7605a71003be3117e0 (diff) | |
| parent | 3ec5b5ab2c0106febd7d41cfe3c1eef41d61561f (diff) | |
Merge http://gkernel.bkbits.net/net-drivers-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ethtool.h | 4 |
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 |