patch-2.3.14 linux/net/sched/sch_api.c

Next file: linux/net/sched/sch_generic.c
Previous file: linux/net/sched/cls_route.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/net/sched/sch_api.c linux/net/sched/sch_api.c
@@ -186,7 +186,7 @@
    (root qdisc, all its children, children of children etc.)
  */
 
-struct Qdisc *qdisc_lookup(struct device *dev, u32 handle)
+struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle)
 {
 	struct Qdisc *q;
 
@@ -276,7 +276,7 @@
 
 /* Allocate an unique handle from space managed by kernel */
 
-u32 qdisc_alloc_handle(struct device *dev)
+u32 qdisc_alloc_handle(struct net_device *dev)
 {
 	int i = 0x10000;
 	static u32 autohandle = TC_H_MAKE(0x80000000U, 0);
@@ -293,7 +293,7 @@
 /* Attach toplevel qdisc to device dev */
 
 static struct Qdisc *
-dev_graft_qdisc(struct device *dev, struct Qdisc *qdisc)
+dev_graft_qdisc(struct net_device *dev, struct Qdisc *qdisc)
 {
 	struct Qdisc *oqdisc;
 
@@ -329,7 +329,7 @@
    Old qdisc is not destroyed but returned in *old.
  */
 
-int qdisc_graft(struct device *dev, struct Qdisc *parent, u32 classid,
+int qdisc_graft(struct net_device *dev, struct Qdisc *parent, u32 classid,
 		struct Qdisc *new, struct Qdisc **old)
 {
 	int err = 0;
@@ -361,7 +361,7 @@
  */
 
 static struct Qdisc *
-qdisc_create(struct device *dev, u32 handle, struct rtattr **tca, int *errp)
+qdisc_create(struct net_device *dev, u32 handle, struct rtattr **tca, int *errp)
 {
 	int err;
 	struct rtattr *kind = tca[TCA_KIND-1];
@@ -503,7 +503,7 @@
 {
 	struct tcmsg *tcm = NLMSG_DATA(n);
 	struct rtattr **tca = arg;
-	struct device *dev;
+	struct net_device *dev;
 	u32 clid = tcm->tcm_parent;
 	struct Qdisc *q = NULL;
 	struct Qdisc *p = NULL;
@@ -560,7 +560,7 @@
 {
 	struct tcmsg *tcm = NLMSG_DATA(n);
 	struct rtattr **tca = arg;
-	struct device *dev;
+	struct net_device *dev;
 	u32 clid = tcm->tcm_parent;
 	struct Qdisc *q = NULL;
 	struct Qdisc *p = NULL;
@@ -751,7 +751,7 @@
 {
 	int idx, q_idx;
 	int s_idx, s_q_idx;
-	struct device *dev;
+	struct net_device *dev;
 	struct Qdisc *q;
 
 	s_idx = cb->args[0];
@@ -797,7 +797,7 @@
 {
 	struct tcmsg *tcm = NLMSG_DATA(n);
 	struct rtattr **tca = arg;
-	struct device *dev;
+	struct net_device *dev;
 	struct Qdisc *q = NULL;
 	struct Qdisc_class_ops *cops;
 	unsigned long cl = 0;
@@ -971,7 +971,7 @@
 {
 	int t;
 	int s_t;
-	struct device *dev;
+	struct net_device *dev;
 	struct Qdisc *q;
 	struct tcmsg *tcm = (struct tcmsg*)NLMSG_DATA(cb->nlh);
 	struct qdisc_dump_args arg;

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