[PATCH] Fix compile error in latest git

[PATCH] Fix compile error in latest git

[Jan Altenberg]

Hi,

I recognized a compile error in latest git:

/here/workdir/git/drivers/net/gianfar.c: In function `gfar_vlan_rx_kill_vid':
/here/workdir/git/drivers/net/gianfar.c:1135: error: structure has no member named `vgrp'

This error was introduced in commit:

commit 6d04e3b04b6ab569cabeb5ca28ad1be11777e895
Merge: 4227003... 5c15bde...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Sun Mar 4 13:16:49 2007 -0800

    Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
    
    * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [VLAN]: Avoid a 4-order allocation.
      [HDLC] Fix dev->header_cache_update having a random value.
      [NetLabel]: Verify sensitivity level has a valid CIPSO mapping
      [PPPOE]: Key connections properly on local device.
      [AF_UNIX]: Test against sk_max_ack_backlog properly.
      [NET]: Fix bugs in "Whether sock accept queue is full" checking

Patch is attached.

Signed-off-by: Jan Altenberg <jan@linutronix.de>

---
 drivers/net/gianfar.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/drivers/net/gianfar.c
===================================================================
--- linux-2.6.orig/drivers/net/gianfar.c
+++ linux-2.6/drivers/net/gianfar.c
@@ -1132,7 +1132,7 @@ static void gfar_vlan_rx_kill_vid(struct
 
 	spin_lock_irqsave(&priv->rxlock, flags);
 
-	vlan_group_set_device(priv->vgrp, vid, NULL);
+	vlan_group_set_device(priv->vlgrp, vid, NULL);
 
 	spin_unlock_irqrestore(&priv->rxlock, flags);
 }

Re: [PATCH] Fix compile error in latest git

[David Miller]

From: Jan Altenberg <jan.altenberg@linutronix.de>
Date: Mon, 05 Mar 2007 12:08:08 +0100

> I recognized a compile error in latest git:
> 
> /here/workdir/git/drivers/net/gianfar.c: In function `gfar_vlan_rx_kill_vid':
> /here/workdir/git/drivers/net/gianfar.c:1135: error: structure has no member named `vgrp'
 ...
> Patch is attached.
> 
> Signed-off-by: Jan Altenberg <jan@linutronix.de>

Thanks for the fix, patch applied.

I did do an allmodconfig build to try and avoid breakage like
that, but alas gianfar only is offered on certain powerpc
systems in the kernel config :-/

Thanks again.