diff mbox

pull request: wireless-next-2.6 2009-12-24

Message ID 20091225044759.GA11186@tuxdriver.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

John W. Linville Dec. 25, 2009, 4:47 a.m. UTC 
On Thu, Dec 24, 2009 at 01:53:14PM -0800, David Miller wrote:
> From: "John W. Linville" <linville@tuxdriver.com>
> Date: Thu, 24 Dec 2009 15:47:22 -0500
> 
> > Dave,
> > 
> > Here is the usual first batch of pent-up wireless patches after the
> > merge window.  It is the usual collection of various driver updates
> > along with a dozen or so mac80211/infrastructure changes.  There is
> > still more, but lots/most of what remains is dependent not only on this
> > batch but also on the fixes that only recently made it into net-next-2.6
> > (and which are not yet in wireless-next-2.6).  So, something to look
> > forward to... :-)
> > 
> > Please let me know if there are problems!
> 
> Let me know when it builds :-)
> 
> awk: /home/davem/src/GIT/net-next-2.6/net/wireless/genregdb.awk: line 29: regular expression compile failed (missing operand)
> * Ignore *
> awk: /home/davem/src/GIT/net-next-2.6/net/wireless/genregdb.awk: line 33: regular expression compile failed (missing operand)
> * Ignore *
> make[2]: *** [net/wireless/regdb.c] Error 2
> make[2]: *** Waiting for unfinished jobs....

Hmm...well, I'm at a loss.  It certainly works here. :-)

Perhaps you could send me your config?  And maybe the output of
"awk -W version"?  I suppose it is possible that I'm relying on some
specific awk feature that isn't commonly available...?

Actually, I think it has to do with the C-style comments on the
cited lines.  Try the patch below?  If it works for you, perhaps you
could just apply it on top of the request pull?

John

---

From 0d5105fb0d1cb949ebb54eb50c4affd33328b866 Mon Sep 17 00:00:00 2001
From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 24 Dec 2009 23:44:51 -0500
Subject: [PATCH] wireless: fix comments in genregdb.awk

Apparently some awk versions choke on C-style comments -- who knew? :-)

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
 net/wireless/genregdb.awk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

Pavel Roskin Dec. 25, 2009, 5:51 a.m. UTC | #1 
Quoting "John W. Linville" <linville@tuxdriver.com>:

> Hmm...well, I'm at a loss.  It certainly works here. :-)

You may want to see this discussion in LKML:
http://thread.gmane.org/gmane.linux.kernel/928654/

The error messages look differently though.  Anyway, genregdb.awk  
appears to require gawk.
John W. Linville Dec. 25, 2009, 4:38 p.m. UTC | #2 
On Fri, Dec 25, 2009 at 12:51:42AM -0500, Pavel Roskin wrote:
> Quoting "John W. Linville" <linville@tuxdriver.com>:
>
>> Hmm...well, I'm at a loss.  It certainly works here. :-)
>
> You may want to see this discussion in LKML:
> http://thread.gmane.org/gmane.linux.kernel/928654/
>
> The error messages look differently though.  Anyway, genregdb.awk  
> appears to require gawk.

Perhaps, but not intentionally.  Hopefully the patch I posted is
sufficient to get things working for non-gawk users...?

John
David Miller Dec. 26, 2009, 1:10 a.m. UTC | #3 
From: "John W. Linville" <linville@tuxdriver.com>
Date: Fri, 25 Dec 2009 11:38:01 -0500

> Perhaps, but not intentionally.  Hopefully the patch I posted is
> sufficient to get things working for non-gawk users...?

It worked here, so I applied it on top
of your pull request and pushed back out
to net-next-2.6

Thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/wireless/genregdb.awk b/net/wireless/genregdb.awk
index 8316cf0..3cc9e69 100644
--- a/net/wireless/genregdb.awk
+++ b/net/wireless/genregdb.awk
@@ -26,11 +26,11 @@  BEGIN {
 }
 
 /^[ \t]*#/ {
-	/* Ignore */
+	# Ignore
 }
 
 !active && /^[ \t]*$/ {
-	/* Ignore */
+	# Ignore
 }
 
 !active && /country/ {