diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /include/linux/ethtool.h | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'include/linux/ethtool.h')
| -rw-r--r-- | include/linux/ethtool.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index b4b038b89ee6..27c67a542235 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
| @@ -467,6 +467,8 @@ struct ethtool_ops { | |||
| 467 | 467 | ||
| 468 | #define ETHTOOL_GRXFH 0x00000029 /* Get RX flow hash configuration */ | 468 | #define ETHTOOL_GRXFH 0x00000029 /* Get RX flow hash configuration */ |
| 469 | #define ETHTOOL_SRXFH 0x0000002a /* Set RX flow hash configuration */ | 469 | #define ETHTOOL_SRXFH 0x0000002a /* Set RX flow hash configuration */ |
| 470 | #define ETHTOOL_GGRO 0x0000002b /* Get GRO enable (ethtool_value) */ | ||
| 471 | #define ETHTOOL_SGRO 0x0000002c /* Set GRO enable (ethtool_value) */ | ||
| 470 | 472 | ||
| 471 | /* compatibility with older code */ | 473 | /* compatibility with older code */ |
| 472 | #define SPARC_ETH_GSET ETHTOOL_GSET | 474 | #define SPARC_ETH_GSET ETHTOOL_GSET |