The patch titled
lockdep-annotate-vlan-net-device-as-being-a-special-class fix
has been removed from the -mm tree. Its filename is
lockdep-annotate-vlan-net-device-as-being-a-special-class-fix.patch
This patch was dropped because it was folded into lockdep-annotate-vlan-net-device-as-being-a-special-class.patch
------------------------------------------------------
Subject: lockdep-annotate-vlan-net-device-as-being-a-special-class fix
From: Frederik Deweerdt <deweerdt@xxxxxxx>
On Tue, Jun 27, 2006 at 10:09:08AM -0400, Peter Staubach wrote:
> Shouldn't this test for new_dev being NULL _before_ it gets used?
Indeed, it should. But the lock is inited in register_netdevice anyway.
I tested (compile+boot+ifconfig) the following patch to mm3, and the trace went
away.
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@xxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/8021q/vlan.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
diff -puN net/8021q/vlan.c~lockdep-annotate-vlan-net-device-as-being-a-special-class-fix net/8021q/vlan.c
--- a/net/8021q/vlan.c~lockdep-annotate-vlan-net-device-as-being-a-special-class-fix
+++ a/net/8021q/vlan.c
@@ -469,7 +469,6 @@ static struct net_device *register_vlan_
new_dev = alloc_netdev(sizeof(struct vlan_dev_info), name,
vlan_setup);
- lockdep_set_class(&new_dev->_xmit_lock, &vlan_netdev_xmit_lock_key);
if (new_dev == NULL)
goto out_unlock;
@@ -528,6 +527,8 @@ static struct net_device *register_vlan_
if (register_netdevice(new_dev))
goto out_free_newdev;
+ lockdep_set_class(&new_dev->_xmit_lock, &vlan_netdev_xmit_lock_key);
+
new_dev->iflink = real_dev->ifindex;
vlan_transfer_operstate(real_dev, new_dev);
linkwatch_fire_event(new_dev); /* _MUST_ call rfc2863_policy() */
_
Patches currently in -mm which might be from deweerdt@xxxxxxx are
origin.patch
lockdep-annotate-vlan-net-device-as-being-a-special-class.patch
lockdep-annotate-vlan-net-device-as-being-a-special-class-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
