3.6.11.2 stable review patch.
If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <rost...@goodmis.org>
commit 387e6a2cc250f2a6a182a5db1cbf7e40500bc5eb
"ppp: set qdisc_tx_busylock to avoid LOCKDEP splat" which was a backport
of upstream commit 0b652fb68c02c1acd0307d3acac4ae7123536031, should not
have been ported to 3.6.11.1 as it broke the build.
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
---
drivers/net/ppp/ppp_generic.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index 2603b99..5c05572 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -1021,15 +1021,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr,
int cmd)
return err;
}
-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,
};
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
