[PATCH] bcm43xx: do not rebuild when kernel version changes

[PATCH] bcm43xx: do not rebuild when kernel version changes

[Sam Ravnborg]

Replacing use of UTS_RELEASE with utsname()->release
avoids that this module is rebuild each
time the kernel version changes.

Compile tested only.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
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);
 }
 

Re: [PATCH] bcm43xx: do not rebuild when kernel version changes

[Michael Buesch]

On Saturday 03 March 2007 20:03, Sam Ravnborg wrote:
> Replacing use of UTS_RELEASE with utsname()->release
> avoids that this module is rebuild each
> time the kernel version changes.
> 
> Compile tested only.

I vote to get rid of the whole bcm43xx_ethtool.c file, as it's useless.
It will vanish with the advent of d80211, anyway.
Larry?

> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> ---
> 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);
>  }
>  
> -
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 

-- 
Greetings Michael.

Re: [PATCH] bcm43xx: do not rebuild when kernel version changes

[Larry Finger]

Michael Buesch wrote:
> On Saturday 03 March 2007 20:03, Sam Ravnborg wrote:
>> Replacing use of UTS_RELEASE with utsname()->release
>> avoids that this module is rebuild each
>> time the kernel version changes.
>>
>> Compile tested only.
> 
> I vote to get rid of the whole bcm43xx_ethtool.c file, as it's useless.
> It will vanish with the advent of d80211, anyway.
> Larry?

Is bcm43xx_ethtool.c really useless? If so, I vote to remove it. I have never tried to use ethtool
on bcm43xx. Similarly, it isn't very often that I recompile the kernel when bcm43xx hasn't changed
and would not have noticed the bug that Sam reported.

Larry

Re: [PATCH] bcm43xx: do not rebuild when kernel version changes

[Michael Buesch]

On Saturday 03 March 2007 22:03, Larry Finger wrote:
> Michael Buesch wrote:
> > On Saturday 03 March 2007 20:03, Sam Ravnborg wrote:
> >> Replacing use of UTS_RELEASE with utsname()->release
> >> avoids that this module is rebuild each
> >> time the kernel version changes.
> >>
> >> Compile tested only.
> > 
> > I vote to get rid of the whole bcm43xx_ethtool.c file, as it's useless.
> > It will vanish with the advent of d80211, anyway.
> > Larry?
> 
> Is bcm43xx_ethtool.c really useless?

Yes it is useless.
1) There isn't really anything ethtool related implemented. Just the useless info stuff.
2) ethtool is rather useless for wireless in general (that's why there isn't
   anything implemented ;) )

Please remove the file, kill it from Makefile and remove the ethtool
ops set in main.c (one line).

-- 
Greetings Michael.

Re: [PATCH] bcm43xx: do not rebuild when kernel version changes

[Sam Ravnborg]

On Sat, Mar 03, 2007 at 03:03:57PM -0600, Larry Finger wrote:
> Michael Buesch wrote:
> > On Saturday 03 March 2007 20:03, Sam Ravnborg wrote:
> >> Replacing use of UTS_RELEASE with utsname()->release
> >> avoids that this module is rebuild each
> >> time the kernel version changes.
> >>
> >> Compile tested only.
> > 
> > I vote to get rid of the whole bcm43xx_ethtool.c file, as it's useless.
> > It will vanish with the advent of d80211, anyway.
> > Larry?
> 
> Is bcm43xx_ethtool.c really useless? If so, I vote to remove it. I have never tried to use ethtool
> on bcm43xx. Similarly, it isn't very often that I recompile the kernel when bcm43xx hasn't changed
> and would not have noticed the bug that Sam reported.
I saw it only because I tossed around with a allmodconfig build.
I do not care if it is fixed one way or the other - but I like that
only relevant parts are rebuild when kernel version changes.

	Sam