On Sunday 04 March 2007 06:55, Larry Finger wrote:
> From: Sam Ravnborg <[EMAIL PROTECTED]>
> 
> In bcm43xx_ethtool, UTS_RELEASE is used. Replacing this with 
> utsname()->release
> avoids rebuilding this module each time the kernel version changes.
> 
> Signed-off-by: Sam Ravnborg <[EMAIL PROTECTED]>
> Signed-off-by: Larry Finger <[EMAIL PROTECTED]>
> ---
> 
> John,
> 
> As the ethtool removal was NACKed by Jeff, we need to do this one.

What the fuck, why?

> Larry
> 
> ===
> 
> diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c 
> b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
> index c947025..d2df6a0 100644
> --- a/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
> +++ b/drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c
> @@ -32,7 +32,7 @@
>  #include <linux/netdevice.h>
>  #include <linux/pci.h>
>  #include <linux/string.h>
> -#include <linux/utsrelease.h>
> +#include <linux/utsname.h>
>  
>  
>  static void bcm43xx_get_drvinfo(struct net_device *dev, struct 
> ethtool_drvinfo *info)
> @@ -40,7 +40,7 @@ static void bcm43xx_get_drvinfo(struct net_device *dev, 
> struct ethtool_drvinfo *
>       struct bcm43xx_private *bcm = bcm43xx_priv(dev);
>  
>       strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
> -     strncpy(info->version, UTS_RELEASE, sizeof(info->version));
> +     strncpy(info->version, utsname()->release, sizeof(info->version));
>       strncpy(info->bus_info, pci_name(bcm->pci_dev), ETHTOOL_BUSINFO_LEN);
>  }
>  
> -
> 
> 
> 

-- 
Greetings Michael.
_______________________________________________
Bcm43xx-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bcm43xx-dev

Reply via email to