---

yaml --- r: 352799 b: refs/heads/master c: 303c07d h: refs/heads/master i: 352797: 734a3c3 352795: f047a98 352791: 51b9e04 352783: ea81434 352767: 586b3a9 v: v3
git-mirror · Feb 19, 2013 · e457a6e · e457a6e
1 parent 2b4b517
commit e457a6e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cb08d7f3a5ea6131f4f243c2080530ac41cb293
+refs/heads/master: 303c07db487be59ae9fda10600ea65ca11c21497
diff --git a/trunk/drivers/net/ppp/ppp_generic.c b/trunk/drivers/net/ppp/ppp_generic.c
@@ -1058,7 +1058,15 @@ ppp_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats64)
 	return stats64;
 }
 
+static struct lock_class_key ppp_tx_busylock;
+static int ppp_dev_init(struct net_device *dev)
+{
+	dev->qdisc_tx_busylock = &ppp_tx_busylock;
+	return 0;
+}
+
 static const struct net_device_ops ppp_netdev_ops = {
+	.ndo_init	 = ppp_dev_init,
 	.ndo_start_xmit  = ppp_start_xmit,
 	.ndo_do_ioctl    = ppp_net_ioctl,
 	.ndo_get_stats64 = ppp_get_stats64,