tunnel: eliminate recursion field

[~andy/linux] / include / net / pkt_sched.h

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 7eafb8d54470bbcf7633dc3c5780fc0d173ff673..f911ec7598efa45e7ac63e984bf0039420481e91 100644 (file)
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -61,8 +61,8 @@ psched_tdiff_bounded(psched_time_t tv1, psched_time_t tv2, psched_time_t bound)
 }
 
 struct qdisc_watchdog {
-       struct tasklet_hrtimer  timer;
-       struct Qdisc            *qdisc;
+       struct hrtimer  timer;
+       struct Qdisc    *qdisc;
 };
 
 extern void qdisc_watchdog_init(struct qdisc_watchdog *wd, struct Qdisc *qdisc);
@@ -87,6 +87,9 @@ extern struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r,
 extern void qdisc_put_rtab(struct qdisc_rate_table *tab);
 extern void qdisc_put_stab(struct qdisc_size_table *tab);
 extern void qdisc_warn_nonwc(char *txt, struct Qdisc *qdisc);
+extern int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
+                          struct net_device *dev, struct netdev_queue *txq,
+                          spinlock_t *root_lock);
 
 extern void __qdisc_run(struct Qdisc *q);