Re: linux-next: Tree for July 20 (qlcnic)

From: Anirban Chakraborty
Date: Wed Jul 20 2011 - 14:07:22 EST



On Jul 20, 2011, at 9:19 AM, Randy Dunlap wrote:

> On Wed, 20 Jul 2011 18:00:41 +1000 Stephen Rothwell wrote:
>
>> Hi all,
>
> When CONFIG_VLAN_8021Q is not enabled:
>
> drivers/net/qlcnic/qlcnic_main.c:4207: error: 'struct net_device' has no member named 'vlgrp'

This is caused by the following commit:

commit 69ecca86da4890c13a5e29c51b4ac76a1a8a62c9
Refs: v3.0-rc7-1265-g69ecca8
Author: David Lamparter <equinox@xxxxxxxxxx>
AuthorDate: Sun Jul 17 08:53:12 2011 +0000
Commit: David S. Miller <davem@xxxxxxxxxxxxx>
CommitDate: Sun Jul 17 12:33:22 2011 -0700

net: vlan, qlcnic: make vlan_find_dev private

there is only one user of vlan_find_dev outside of the actual vlan code:
qlcnic uses it to iterate over some VLANs it knows.

let's just make vlan_find_dev private to the VLAN code and have the
iteration in qlcnic be a bit more direct. (a few rcu dereferences less
too)

Signed-off-by: David Lamparter <equinox@xxxxxxxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Cc: Amit Kumar Salecha <amit.salecha@xxxxxxxxxx>
Cc: Anirban Chakraborty <anirban.chakraborty@xxxxxxxxxx>
Cc: linux-driver@xxxxxxxxxx
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/