diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-04-18 13:19:07 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-04-18 13:19:07 -0700 |
| commit | 775d71e49c65f1f6aa57776ea1da62988fc9a30a (patch) | |
| tree | ce03cae544bacc8dda67422fd66a543dd1ae3c99 /include/linux/ethtool.h | |
| parent | 18e82d2b952ab57fc1c8a69d4fa14e562f2aecf6 (diff) | |
| parent | c1a952f48517b5545075d8eb1a5d543099bd2ae1 (diff) | |
Merge branch 'upstream/linaro.38' into linaro-android.38KNOWN_GOOD
Diffstat (limited to 'include/linux/ethtool.h')
| -rw-r--r-- | include/linux/ethtool.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index a3c1874171c..a04b6cee1cb 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -591,6 +591,7 @@ int ethtool_op_set_ufo(struct net_device *dev, u32 data); u32 ethtool_op_get_flags(struct net_device *dev); int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported); void ethtool_ntuple_flush(struct net_device *dev); +bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported); /** * ðtool_ops - Alter and report network device settings |