summaryrefslogtreecommitdiffstats
path: root/include/linux/ethtool.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:04:37 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:04:37 -0700
commit3d963f5bb1949af53a37acf36d3b12e97ca9b1e5 (patch)
tree9449490978cdb7858a7c713ee88f15ffc26a6d71 /include/linux/ethtool.h
parent5be1d85c208f135fc88f972f91b91a879b702b40 (diff)
parente13934563db047043ccead26412f552375cea90c (diff)
downloadkernel-crypto-3d963f5bb1949af53a37acf36d3b12e97ca9b1e5.tar.gz
kernel-crypto-3d963f5bb1949af53a37acf36d3b12e97ca9b1e5.tar.xz
kernel-crypto-3d963f5bb1949af53a37acf36d3b12e97ca9b1e5.zip
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/linux/ethtool.h')
-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 a0ab26aab45..d7021c391b2 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -408,6 +408,8 @@ struct ethtool_ops {
#define SUPPORTED_FIBRE (1 << 10)
#define SUPPORTED_BNC (1 << 11)
#define SUPPORTED_10000baseT_Full (1 << 12)
+#define SUPPORTED_Pause (1 << 13)
+#define SUPPORTED_Asym_Pause (1 << 14)
/* Indicates what features are advertised by the interface. */
#define ADVERTISED_10baseT_Half (1 << 0)
@@ -423,6 +425,8 @@ struct ethtool_ops {
#define ADVERTISED_FIBRE (1 << 10)
#define ADVERTISED_BNC (1 << 11)
#define ADVERTISED_10000baseT_Full (1 << 12)
+#define ADVERTISED_Pause (1 << 13)
+#define ADVERTISED_Asym_Pause (1 << 14)
/* The following are all involved in forcing a particular link
* mode for the device for setting things. When getting the