Build fixup for busted ethtool perm_addr support patch.
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
The hunk below is busted...
On Tue, Jul 26, 2005 at 09:32:38AM -0500, Jon Wetzel wrote:
> @@ -683,6 +683,22 @@
> return ret;
> }
>
> +static int ethtool_get_perm_addr(struct net_device *dev, void __user
> *useraddr)
> +{
> + struct ethtool_addr addr = { ETHTOOL_GPERMADDR };
> + struct ethtool_ops *ops = dev->ethtool_ops;
> +
> + if (!ops->get_perm_addr){
> + return -EOPNOTSUPP;
> +
> + ops->get_perm_addr(dev, &addr);
> +
> + if (copy_to_user(useraddr, &addr, sizeof(addr)))
> + return -EFAULT;
> +
> + return 0;
> +}
> +
> /* The main entry point in this file. Called from net/core/dev.c */
>
> int dev_ethtool(struct ifreq *ifr)
Patch follows...
net/core/ethtool.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -694,7 +694,7 @@ static int ethtool_get_perm_addr(struct
struct ethtool_addr addr = { ETHTOOL_GPERMADDR };
struct ethtool_ops *ops = dev->ethtool_ops;
- if (!ops->get_perm_addr){
+ if (!ops->get_perm_addr)
return -EOPNOTSUPP;
ops->get_perm_addr(dev, &addr);
--
John W. Linville
[EMAIL PROTECTED]
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
