diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 12:08:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 12:08:35 +0100 |
| commit | 017db6aba01656f754d034bf17c6fae0a76ca36e (patch) | |
| tree | a3cf0fd4d94aaaa6d56013da1386bd71ca929e52 /net/core/ethtool.c | |
| parent | 964318b02e12781615db595075a29557f4302940 (diff) | |
| parent | 4b73febd1ba302268aabe370de25601eaa884b25 (diff) | |
Merge branch 'tracking-linux-3.x.y' into merge-manifest
Diffstat (limited to 'net/core/ethtool.c')
| -rw-r--r-- | net/core/ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 3e9b2c3e30f..41f4bdfa5e1 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1416,7 +1416,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) void __user *useraddr = ifr->ifr_data; u32 ethcmd; int rc; - u32 old_features; + netdev_features_t old_features; if (!dev || !netif_device_present(dev)) return -ENODEV; |