patch-2.3.14 linux/include/net/pkt_sched.h

Next file: linux/include/net/psnap.h
Previous file: linux/include/net/p8022.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/include/net/pkt_sched.h linux/include/net/pkt_sched.h
@@ -86,7 +86,7 @@
 	u32			handle;
 	atomic_t		refcnt;
 	struct sk_buff_head	q;
-	struct device 		*dev;
+	struct net_device 		*dev;
 
 	struct tc_stats		stats;
 	unsigned long		tx_timeo;
@@ -412,15 +412,15 @@
 
 int register_qdisc(struct Qdisc_ops *qops);
 int unregister_qdisc(struct Qdisc_ops *qops);
-struct Qdisc *qdisc_lookup(struct device *dev, u32 handle);
-struct Qdisc *qdisc_lookup_class(struct device *dev, u32 handle);
-void dev_init_scheduler(struct device *dev);
-void dev_shutdown(struct device *dev);
-void dev_activate(struct device *dev);
-void dev_deactivate(struct device *dev);
+struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle);
+struct Qdisc *qdisc_lookup_class(struct net_device *dev, u32 handle);
+void dev_init_scheduler(struct net_device *dev);
+void dev_shutdown(struct net_device *dev);
+void dev_activate(struct net_device *dev);
+void dev_deactivate(struct net_device *dev);
 void qdisc_reset(struct Qdisc *qdisc);
 void qdisc_destroy(struct Qdisc *qdisc);
-struct Qdisc * qdisc_create_dflt(struct device *dev, struct Qdisc_ops *ops);
+struct Qdisc * qdisc_create_dflt(struct net_device *dev, struct Qdisc_ops *ops);
 int qdisc_new_estimator(struct tc_stats *stats, struct rtattr *opt);
 void qdisc_kill_estimator(struct tc_stats *stats);
 struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, struct rtattr *tab);
@@ -430,7 +430,7 @@
 int pktsched_init(void);
 
 extern void qdisc_run_queues(void);
-extern int qdisc_restart(struct device *dev);
+extern int qdisc_restart(struct net_device *dev);
 
 extern spinlock_t qdisc_runqueue_lock;
 
@@ -466,7 +466,7 @@
  * BH must be disabled on this CPU.
  */
 
-extern __inline__ void qdisc_wakeup(struct device *dev)
+extern __inline__ void qdisc_wakeup(struct net_device *dev)
 {
 	if (!dev->tbusy) {
 		spin_lock(&dev->queue_lock);
@@ -479,7 +479,7 @@
 /* Calculate maximal size of packet seen by hard_start_xmit
    routine of this device.
  */
-extern __inline__ unsigned psched_mtu(struct device *dev)
+extern __inline__ unsigned psched_mtu(struct net_device *dev)
 {
 	unsigned mtu = dev->mtu;
 	return dev->hard_header ? mtu + dev->hard_header_len : mtu;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)