diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /net/core/ethtool.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
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 a1086fb0c0c..24bd57493c0 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c | |||
| @@ -513,7 +513,7 @@ static int ethtool_set_one_feature(struct net_device *dev, | |||
| 513 | } | 513 | } |
| 514 | } | 514 | } |
| 515 | 515 | ||
| 516 | static int __ethtool_set_flags(struct net_device *dev, u32 data) | 516 | int __ethtool_set_flags(struct net_device *dev, u32 data) |
| 517 | { | 517 | { |
| 518 | u32 changed; | 518 | u32 changed; |
| 519 | 519 | ||