From dd176060ff17bbcfcbd435251c24b27b07d4dd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Wed, 16 Nov 2011 14:32:03 +0000 Subject: [PATCH] --- yaml --- r: 277583 b: refs/heads/master c: 09da71b1212f900cca390d2bffc32b2ae4e4eee2 h: refs/heads/master i: 277581: 8d68cd77e8953adc1a3a51b98b1d62d731c06e50 277579: 935e881651a2d141db7208135c6710e6d2b4d43a 277575: 1de517a82ae407470a05116ebdb96c298ce39abc 277567: 214ca8ed9aefb048068834a6e8bc95971991e269 v: v3 --- [refs] | 2 +- trunk/net/core/ethtool.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 899b34a3cd05..9c92fe6aa910 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b721e25383c394f24fa19a66517c5efca382c2e5 +refs/heads/master: 09da71b1212f900cca390d2bffc32b2ae4e4eee2 diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index d2eff9ec88be..31b0b7f5383e 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/net/core/ethtool.c @@ -87,13 +87,14 @@ static int ethtool_get_features(struct net_device *dev, void __user *useraddr) int i; /* in case feature bits run out again */ - BUILD_BUG_ON(ETHTOOL_DEV_FEATURE_WORDS*sizeof(u32) > sizeof(netdev_features_t)); + BUILD_BUG_ON(ETHTOOL_DEV_FEATURE_WORDS * sizeof(u32) > sizeof(netdev_features_t)); for (i = 0; i < ETHTOOL_DEV_FEATURE_WORDS; ++i) { - features[i].available = (u32)(dev->hw_features >> (32*i)); - features[i].requested = (u32)(dev->wanted_features >> (32*i)); - features[i].active = (u32)(dev->features >> (32*i)); - features[i].never_changed = (u32)(NETIF_F_NEVER_CHANGE >> (32*i)); + features[i].available = (u32)(dev->hw_features >> (32 * i)); + features[i].requested = (u32)(dev->wanted_features >> (32 * i)); + features[i].active = (u32)(dev->features >> (32 * i)); + features[i].never_changed = + (u32)(NETIF_F_NEVER_CHANGE >> (32 * i)); } sizeaddr = useraddr + offsetof(struct ethtool_gfeatures, size); @@ -130,8 +131,8 @@ static int ethtool_set_features(struct net_device *dev, void __user *useraddr) return -EFAULT; for (i = 0; i < ETHTOOL_DEV_FEATURE_WORDS; ++i) { - valid |= (netdev_features_t)features[i].valid << (32*i); - wanted |= (netdev_features_t)features[i].requested << (32*i); + valid |= (netdev_features_t)features[i].valid << (32 * i); + wanted |= (netdev_features_t)features[i].requested << (32 * i); } if (valid & ~NETIF_F_ETHTOOL_BITS)