From: "John W. Linville" <linville@tuxdriver•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Sam Ravnborg <sam@ravnborg•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: wireless/kbuild tree build failure
Date: Tue, 6 Oct 2009 10:37:55 -0400 [thread overview]
Message-ID: <20091006143754.GB2911@tuxdriver.com> (raw)
In-Reply-To: <20091006141057.GA2911@tuxdriver.com>
On Tue, Oct 06, 2009 at 10:10:58AM -0400, John W. Linville wrote:
> On Tue, Oct 06, 2009 at 04:16:39PM +1100, Stephen Rothwell wrote:
> > Hi John,
> >
> > Today's linux-next build (i386 defconfig) failed like this:
> >
> > net/wireless/ethtool.c:1:30: error: linux/utsrelease.h: No such file or directory
> > net/wireless/ethtool.c: In function 'cfg80211_get_drvinfo':
> > net/wireless/ethtool.c:13: error: 'UTS_RELEASE' undeclared (first use in this function)
> >
> > Caused by commit fdd4b63be177e74b9346a557b75f4b48f3a42ee1 ("wireless:
> > implement basic ethtool support for cfg80211 devices").
> >
> > utsrelease.h is now in include/generated after commit
> > bbae701f7f258b051ed199ef71c5e85e683c0fb8 ("kbuild: move utsrelease.h to
> > include/generated") from the kbuild tree. (My other builds only worked
> > because utsrelease.h was left over in include/linux from previous builds.)
> >
> > I have reverted the kbuild commit for today. Sam, we need to come up
> > with a better solution ... maybe for one release we could have the old
> > files including the new files ... maybe remove the old files after
> > 2.6.33-rc2 ...
>
> It looks like not much uses utsrelease.h -- should I be using something
> else to get a version identifier for the running kernel?
Looks like this would be better...forgive me for being way behind
the times!
diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c
index bec385c..ca4c825 100644
--- a/net/wireless/ethtool.c
+++ b/net/wireless/ethtool.c
@@ -1,4 +1,4 @@
-#include <linux/utsrelease.h>
+#include <linux/utsname.h>
#include <net/cfg80211.h>
#include "ethtool.h"
@@ -10,7 +10,7 @@ static void cfg80211_get_drvinfo(struct net_device *dev,
strlcpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name,
sizeof(info->driver));
- strlcpy(info->version, UTS_RELEASE, sizeof(info->version));
+ strlcpy(info->version, init_utsname()->release, sizeof(info->version));
if (wdev->wiphy->fw_version[0])
strncpy(info->fw_version, wdev->wiphy->fw_version,
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver•com might be all we have. Be ready.
prev parent reply other threads:[~2009-10-06 14:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-06 5:16 linux-next: wireless/kbuild tree build failure Stephen Rothwell
2009-10-06 14:10 ` John W. Linville
2009-10-06 14:37 ` John W. Linville [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091006143754.GB2911@tuxdriver.com \
--to=linville@tuxdriver$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sam@ravnborg$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox