13 files changed, 43 insertions, 51 deletions

diff --git a/net/sched/Makefile b/net/sched/Makefile
index e48d0d456b3e..0f06aec66094 100644
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
@@ -7,13 +7,13 @@ obj-y	:= sch_generic.o
 obj-$(CONFIG_NET_SCHED)         += sch_api.o sch_fifo.o sch_blackhole.o
 obj-$(CONFIG_NET_CLS)           += cls_api.o
 obj-$(CONFIG_NET_CLS_ACT)       += act_api.o
-obj-$(CONFIG_NET_ACT_POLICE)    += police.o
-obj-$(CONFIG_NET_CLS_POLICE)    += police.o
-obj-$(CONFIG_NET_ACT_GACT)      += gact.o
-obj-$(CONFIG_NET_ACT_MIRRED)    += mirred.o
-obj-$(CONFIG_NET_ACT_IPT)       += ipt.o
-obj-$(CONFIG_NET_ACT_PEDIT)     += pedit.o
-obj-$(CONFIG_NET_ACT_SIMP)      += simple.o
+obj-$(CONFIG_NET_ACT_POLICE)    += act_police.o
+obj-$(CONFIG_NET_CLS_POLICE)    += act_police.o
+obj-$(CONFIG_NET_ACT_GACT)      += act_gact.o
+obj-$(CONFIG_NET_ACT_MIRRED)    += act_mirred.o
+obj-$(CONFIG_NET_ACT_IPT)       += act_ipt.o
+obj-$(CONFIG_NET_ACT_PEDIT)     += act_pedit.o
+obj-$(CONFIG_NET_ACT_SIMP)      += act_simple.o
 obj-$(CONFIG_NET_SCH_CBQ)       += sch_cbq.o
 obj-$(CONFIG_NET_SCH_HTB)       += sch_htb.o
 obj-$(CONFIG_NET_SCH_HPFQ)      += sch_hpfq.o
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 2ce1cb2aa2ed..792ce59940ec 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -165,7 +165,7 @@ int tcf_action_exec(struct sk_buff *skb, struct tc_action *act,
         while ((a = act) != NULL) {
 repeat:
                 if (a->ops && a->ops->act) {
-                        ret = a->ops->act(&skb, a, res);
+                        ret = a->ops->act(skb, a, res);
                         if (TC_MUNGED & skb->tc_verd) {
                                 /* copied already, allow trampling */
                                 skb->tc_verd = SET_TC_OK2MUNGE(skb->tc_verd);
@@ -290,7 +290,7 @@ struct tc_action *tcf_action_init_1(struct rtattr *rta, struct rtattr *est,
         if (a_o == NULL) {
 #ifdef CONFIG_KMOD
                 rtnl_unlock();
-                request_module(act_name);
+                request_module("act_%s", act_name);
                 rtnl_lock();
 
                 a_o = tc_lookup_action_n(act_name);
diff --git a/net/sched/gact.c b/net/sched/act_gact.c
index d1c6d542912a..a1e68f78dcc2 100644
--- a/net/sched/gact.c
+++ b/net/sched/act_gact.c
@@ -135,10 +135,9 @@ tcf_gact_cleanup(struct tc_action *a, int bind)
 }
 
 static int
-tcf_gact(struct sk_buff **pskb, struct tc_action *a, struct tcf_result *res)
+tcf_gact(struct sk_buff *skb, struct tc_action *a, struct tcf_result *res)
 {
         struct tcf_gact *p = PRIV(a, gact);
-        struct sk_buff *skb = *pskb;
         int action = TC_ACT_SHOT;
 
         spin_lock(&p->lock);
diff --git a/net/sched/ipt.c b/net/sched/act_ipt.c
index f50136eed211..b5001939b74b 100644
--- a/net/sched/ipt.c
+++ b/net/sched/act_ipt.c
@@ -201,11 +201,10 @@ tcf_ipt_cleanup(struct tc_action *a, int bind)
 }
 
 static int
-tcf_ipt(struct sk_buff **pskb, struct tc_action *a, struct tcf_result *res)
+tcf_ipt(struct sk_buff *skb, struct tc_action *a, struct tcf_result *res)
 {
         int ret = 0, result = 0;
         struct tcf_ipt *p = PRIV(a, ipt);
-        struct sk_buff *skb = *pskb;
 
         if (skb_cloned(skb)) {
                 if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
@@ -222,6 +221,9 @@ tcf_ipt(struct sk_buff **pskb, struct tc_action *a, struct tcf_result *res)
          worry later - danger - this API seems to have changed
          from earlier kernels */
 
+        /* iptables targets take a double skb pointer in case the skb
+         * needs to be replaced. We don't own the skb, so this must not
+         * happen. The pskb_expand_head above should make sure of this */
         ret = p->t->u.kernel.target->target(&skb, skb->dev, NULL,
                                             p->hook, p->t->data, NULL);
         switch (ret) {
diff --git a/net/sched/mirred.c b/net/sched/act_mirred.c
index 20d06916dc0b..4fcccbd50885 100644
--- a/net/sched/mirred.c
+++ b/net/sched/act_mirred.c
@@ -158,12 +158,11 @@ tcf_mirred_cleanup(struct tc_action *a, int bind)
 }
 
 static int
-tcf_mirred(struct sk_buff **pskb, struct tc_action *a, struct tcf_result *res)
+tcf_mirred(struct sk_buff *skb, struct tc_action *a, struct tcf_result *res)
 {
         struct tcf_mirred *p = PRIV(a, mirred);
         struct net_device *dev;
         struct sk_buff *skb2 = NULL;
-        struct sk_buff *skb = *pskb;
         u32 at = G_TC_AT(skb->tc_verd);
 
         spin_lock(&p->lock);
diff --git a/net/sched/pedit.c b/net/sched/act_pedit.c
index 767d24f4610e..1742a68e0122 100644
--- a/net/sched/pedit.c
+++ b/net/sched/act_pedit.c
@@ -130,10 +130,9 @@ tcf_pedit_cleanup(struct tc_action *a, int bind)
 }
 
 static int
-tcf_pedit(struct sk_buff **pskb, struct tc_action *a, struct tcf_result *res)
+tcf_pedit(struct sk_buff *skb, struct tc_action *a, struct tcf_result *res)
 {
         struct tcf_pedit *p = PRIV(a, pedit);
-        struct sk_buff *skb = *pskb;
         int i, munged = 0;
         u8 *pptr;
 
@@ -246,10 +245,12 @@ tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a,int bind, int ref)
         t.lastuse = jiffies_to_clock_t(jiffies - p->tm.lastuse);
         t.expires = jiffies_to_clock_t(p->tm.expires);
         RTA_PUT(skb, TCA_PEDIT_TM, sizeof(t), &t);
+        kfree(opt);
         return skb->len;
 
 rtattr_failure:
         skb_trim(skb, b - skb->data);
+        kfree(opt);
         return -1;
 }
 
diff --git a/net/sched/police.c b/net/sched/act_police.c
index eb39fb2f39b6..fa877f8f652c 100644
--- a/net/sched/police.c
+++ b/net/sched/act_police.c
@@ -284,11 +284,10 @@ static int tcf_act_police_cleanup(struct tc_action *a, int bind)
         return 0;
 }
 
-static int tcf_act_police(struct sk_buff **pskb, struct tc_action *a,
+static int tcf_act_police(struct sk_buff *skb, struct tc_action *a,
                           struct tcf_result *res)
 {
         psched_time_t now;
-        struct sk_buff *skb = *pskb;
         struct tcf_police *p = PRIV(a);
         long toks;
         long ptoks = 0;
@@ -408,7 +407,7 @@ police_cleanup_module(void)
 module_init(police_init_module);
 module_exit(police_cleanup_module);
 
-#endif
+#else /* CONFIG_NET_CLS_ACT */
 
 struct tcf_police * tcf_police_locate(struct rtattr *rta, struct rtattr *est)
 {
@@ -545,6 +544,7 @@ int tcf_police(struct sk_buff *skb, struct tcf_police *p)
         spin_unlock(&p->lock);
         return p->action;
 }
+EXPORT_SYMBOL(tcf_police);
 
 int tcf_police_dump(struct sk_buff *skb, struct tcf_police *p)
 {
@@ -601,13 +601,4 @@ errout:
         return -1;
 }
 
-
-EXPORT_SYMBOL(tcf_police);
-EXPORT_SYMBOL(tcf_police_destroy);
-EXPORT_SYMBOL(tcf_police_dump);
-EXPORT_SYMBOL(tcf_police_dump_stats);
-EXPORT_SYMBOL(tcf_police_hash);
-EXPORT_SYMBOL(tcf_police_ht);
-EXPORT_SYMBOL(tcf_police_locate);
-EXPORT_SYMBOL(tcf_police_lookup);
-EXPORT_SYMBOL(tcf_police_new_index);
+#endif /* CONFIG_NET_CLS_ACT */
diff --git a/net/sched/simple.c b/net/sched/act_simple.c
index 8a6ae4f491e8..e5f2e1f431e2 100644
--- a/net/sched/simple.c
+++ b/net/sched/act_simple.c
@@ -44,9 +44,8 @@ static DEFINE_RWLOCK(simp_lock);
 #include <net/pkt_act.h>
 #include <net/act_generic.h>
 
-static int tcf_simp(struct sk_buff **pskb, struct tc_action *a, struct tcf_result *res)
+static int tcf_simp(struct sk_buff *skb, struct tc_action *a, struct tcf_result *res)
 {
-        struct sk_buff *skb = *pskb;
         struct tcf_defact *p = PRIV(a, defact);
 
         spin_lock(&p->lock);
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 09453f997d8c..6cd81708bf71 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -257,7 +257,7 @@ cbq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
             (cl = cbq_class_lookup(q, prio)) != NULL)
                 return cl;
 
-        *qerr = NET_XMIT_DROP;
+        *qerr = NET_XMIT_BYPASS;
         for (;;) {
                 int result = 0;
                 defmap = head->defaults;
@@ -413,7 +413,7 @@ cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         q->rx_class = cl;
 #endif
         if (cl == NULL) {
-                if (ret == NET_XMIT_DROP)
+                if (ret == NET_XMIT_BYPASS)
                         sch->qstats.drops++;
                 kfree_skb(skb);
                 return ret;
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index c26764bc4103..91132f6871d7 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -208,7 +208,7 @@ struct hfsc_sched
 do {                                                                    \
         struct timeval tv;                                              \
         do_gettimeofday(&tv);                                           \
-        (stamp) = 1000000ULL * tv.tv_sec + tv.tv_usec;                  \
+        (stamp) = 1ULL * USEC_PER_SEC * tv.tv_sec + tv.tv_usec;         \
 } while (0)
 #endif
 
@@ -502,8 +502,8 @@ d2dx(u32 d)
         u64 dx;
 
         dx = ((u64)d * PSCHED_JIFFIE2US(HZ));
-        dx += 1000000 - 1;
-        do_div(dx, 1000000);
+        dx += USEC_PER_SEC - 1;
+        do_div(dx, USEC_PER_SEC);
         return dx;
 }
 
@@ -523,7 +523,7 @@ dx2d(u64 dx)
 {
         u64 d;
 
-        d = dx * 1000000;
+        d = dx * USEC_PER_SEC;
         do_div(d, PSCHED_JIFFIE2US(HZ));
         return (u32)d;
 }
@@ -1227,7 +1227,7 @@ hfsc_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
                 if (cl->level == 0)
                         return cl;
 
-        *qerr = NET_XMIT_DROP;
+        *qerr = NET_XMIT_BYPASS;
         tcf = q->root.filter_list;
         while (tcf && (result = tc_classify(skb, tcf, &res)) >= 0) {
 #ifdef CONFIG_NET_CLS_ACT
@@ -1643,7 +1643,7 @@ hfsc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 
         cl = hfsc_classify(skb, sch, &err);
         if (cl == NULL) {
-                if (err == NET_XMIT_DROP)
+                if (err == NET_XMIT_BYPASS)
                         sch->qstats.drops++;
                 kfree_skb(skb);
                 return err;
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 558cc087e602..3ec95df4a85e 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -321,7 +321,7 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch, in
         if ((cl = htb_find(skb->priority,sch)) != NULL && cl->level == 0) 
                 return cl;
 
-        *qerr = NET_XMIT_DROP;
+        *qerr = NET_XMIT_BYPASS;
         tcf = q->filter_list;
         while (tcf && (result = tc_classify(skb, tcf, &res)) >= 0) {
 #ifdef CONFIG_NET_CLS_ACT
@@ -724,7 +724,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         }
 #ifdef CONFIG_NET_CLS_ACT
     } else if (!cl) {
-        if (ret == NET_XMIT_DROP)
+        if (ret == NET_XMIT_BYPASS)
                 sch->qstats.drops++;
         kfree_skb (skb);
         return ret;
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 3ac0f495bad0..5b3a3e48ed92 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -54,7 +54,7 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
         u32 band = skb->priority;
         struct tcf_result res;
 
-        *qerr = NET_XMIT_DROP;
+        *qerr = NET_XMIT_BYPASS;
         if (TC_H_MAJ(skb->priority) != sch->handle) {
 #ifdef CONFIG_NET_CLS_ACT
                 switch (tc_classify(skb, q->filter_list, &res)) {
@@ -91,7 +91,8 @@ prio_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         qdisc = prio_classify(skb, sch, &ret);
 #ifdef CONFIG_NET_CLS_ACT
         if (qdisc == NULL) {
-                if (ret == NET_XMIT_DROP)
+
+                if (ret == NET_XMIT_BYPASS)
                         sch->qstats.drops++;
                 kfree_skb(skb);
                 return ret;
@@ -118,7 +119,7 @@ prio_requeue(struct sk_buff *skb, struct Qdisc* sch)
         qdisc = prio_classify(skb, sch, &ret);
 #ifdef CONFIG_NET_CLS_ACT
         if (qdisc == NULL) {
-                if (ret == NET_XMIT_DROP)
+                if (ret == NET_XMIT_BYPASS)
                         sch->qstats.drops++;
                 kfree_skb(skb);
                 return ret;
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index c4a2a8c4c339..79b8ef34c6e4 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -274,7 +274,7 @@ teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *de
 
 static int teql_master_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct teql_master *master = (void*)dev->priv;
+        struct teql_master *master = netdev_priv(dev);
         struct Qdisc *start, *q;
         int busy;
         int nores;
@@ -350,7 +350,7 @@ drop:
 static int teql_master_open(struct net_device *dev)
 {
         struct Qdisc * q;
-        struct teql_master *m = (void*)dev->priv;
+        struct teql_master *m = netdev_priv(dev);
         int mtu = 0xFFFE;
         unsigned flags = IFF_NOARP|IFF_MULTICAST;
 
@@ -397,13 +397,13 @@ static int teql_master_close(struct net_device *dev)
 
 static struct net_device_stats *teql_master_stats(struct net_device *dev)
 {
-        struct teql_master *m = (void*)dev->priv;
+        struct teql_master *m = netdev_priv(dev);
         return &m->stats;
 }
 
 static int teql_master_mtu(struct net_device *dev, int new_mtu)
 {
-        struct teql_master *m = (void*)dev->priv;
+        struct teql_master *m = netdev_priv(dev);
         struct Qdisc *q;
 
         if (new_mtu < 68)
@@ -423,7 +423,7 @@ static int teql_master_mtu(struct net_device *dev, int new_mtu)
 
 static __init void teql_master_setup(struct net_device *dev)
 {
-        struct teql_master *master = dev->priv;
+        struct teql_master *master = netdev_priv(dev);
         struct Qdisc_ops *ops = &master->qops;
 
         master->dev     = dev;
@@ -476,7 +476,7 @@ static int __init teql_init(void)
                         break;
                 }
 
-                master = dev->priv;
+                master = netdev_priv(dev);
 
                 strlcpy(master->qops.id, dev->name, IFNAMSIZ);
                 err = register_qdisc(&master->qops);