OSDN Git Service

[PATCH] bcm43xx: do not rebuild when kernel version changes
authorSam Ravnborg <sam@ravnborg.org>
Sun, 4 Mar 2007 05:55:08 +0000 (23:55 -0600)
committerJeff Garzik <jeff@garzik.org>
Sat, 28 Apr 2007 15:00:55 +0000 (11:00 -0400)
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 <sam@ravnborg.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c

index c947025..d2df6a0 100644 (file)
@@ -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);
 }