From e457a6e40b20e0675ec3c039d00655ae79eeb493 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Tue, 19 Feb 2013 10:42:03 -0800 Subject: [PATCH] --- yaml --- r: 352799 b: refs/heads/master c: 303c07db487be59ae9fda10600ea65ca11c21497 h: refs/heads/master i: 352797: 734a3c3be922f9b2f5fc06b80da06a6ad192cdc9 352795: f047a98147d81e58bea3e8d8cf569d635486f283 352791: 51b9e04bad302c296fcafbd52c283d71ca9c0f48 352783: ea814349c9d0f0f8b3ca8804e6aec69e7df82b36 352767: 586b3a985979b1c91ded6a97c72d728d6a607b4b v: v3 --- [refs] | 2 +- trunk/drivers/net/ppp/ppp_generic.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 52f3edb0f48a..a7ebf6239c21 100644 --- 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 index 4fd754e74eb2..3db9131e9229 100644 --- 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,