The patch titled
lockdep: annotate vlan net device as being a special class
has been removed from the -mm tree. Its filename is
lockdep-annotate-vlan-net-device-as-being-a-special-class.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: lockdep: annotate vlan net device as being a special class
From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
vlan network devices have devices nesting below it, and are a special
"super class" of normal network devices; split their locks off into a
separate class since they always nest.
[deweerdt@xxxxxxx: fix possible null-pointer deref]
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/8021q/vlan.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff -puN net/8021q/vlan.c~lockdep-annotate-vlan-net-device-as-being-a-special-class net/8021q/vlan.c
--- a/net/8021q/vlan.c~lockdep-annotate-vlan-net-device-as-being-a-special-class
+++ a/net/8021q/vlan.c
@@ -364,6 +364,14 @@ static void vlan_transfer_operstate(cons
}
}
+/*
+ * vlan network devices have devices nesting below it, and are a special
+ * "super class" of normal network devices; split their locks off into a
+ * separate class since they always nest.
+ */
+static struct lock_class_key vlan_netdev_xmit_lock_key;
+
+
/* Attach a VLAN device to a mac address (ie Ethernet Card).
* Returns the device that was created, or NULL if there was
* an error of some kind.
@@ -460,6 +468,7 @@ static struct net_device *register_vlan_
new_dev = alloc_netdev(sizeof(struct vlan_dev_info), name,
vlan_setup);
+
if (new_dev == NULL)
goto out_unlock;
@@ -518,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 arjan@xxxxxxxxxxxxxxx are
origin.patch
lock-validator-fix-ns83820c-irq-flags-bug.patch
sleazy-fpu-feature-x86_64-support.patch
sleazy-fpu-feature-x86_64-support-fix.patch
sleazy-fpu-feature-i386-support.patch
delay-accounting-taskstats-interface-send-tgid-once.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
