10 files changed, 53 insertions, 61 deletions

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 4f912c0e225b..eb48306033d9 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -218,10 +218,12 @@ static int mirred_device_event(struct notifier_block *unused,
 
         if (event == NETDEV_UNREGISTER)
                 list_for_each_entry(m, &mirred_list, tcfm_list) {
+                        spin_lock_bh(&m->tcf_lock);
                         if (m->tcfm_dev == dev) {
                                 dev_put(dev);
                                 m->tcfm_dev = NULL;
                         }
+                        spin_unlock_bh(&m->tcf_lock);
                 }
 
         return NOTIFY_DONE;
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 45527e6b52db..c28b0d327b12 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -561,13 +561,14 @@ EXPORT_SYMBOL(tcf_exts_change);
 int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts)
 {
 #ifdef CONFIG_NET_CLS_ACT
+        struct nlattr *nest;
+
         if (exts->action && !list_empty(&exts->actions)) {
                 /*
                  * again for backward compatible mode - we want
                  * to work with both old and new modes of entering
                  * tc data even if iproute2  was newer - jhs
                  */
-                struct nlattr *nest;
                 if (exts->type != TCA_OLD_COMPAT) {
                         nest = nla_nest_start(skb, exts->action);
                         if (nest == NULL)
@@ -585,10 +586,14 @@ int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts)
                         nla_nest_end(skb, nest);
                 }
         }
-#endif
         return 0;
-nla_put_failure: __attribute__ ((unused))
+
+nla_put_failure:
+        nla_nest_cancel(skb, nest);
         return -1;
+#else
+        return 0;
+#endif
 }
 EXPORT_SYMBOL(tcf_exts_dump);
 
diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c
index 13f64df2c710..0e30d58149da 100644
--- a/net/sched/cls_bpf.c
+++ b/net/sched/cls_bpf.c
@@ -30,7 +30,7 @@ struct cls_bpf_head {
 };
 
 struct cls_bpf_prog {
-        struct sk_filter *filter;
+        struct bpf_prog *filter;
         struct sock_filter *bpf_ops;
         struct tcf_exts exts;
         struct tcf_result res;
@@ -54,7 +54,7 @@ static int cls_bpf_classify(struct sk_buff *skb, const struct tcf_proto *tp,
         int ret;
 
         list_for_each_entry(prog, &head->plist, link) {
-                int filter_res = SK_RUN_FILTER(prog->filter, skb);
+                int filter_res = BPF_PROG_RUN(prog->filter, skb);
 
                 if (filter_res == 0)
                         continue;
@@ -92,7 +92,7 @@ static void cls_bpf_delete_prog(struct tcf_proto *tp, struct cls_bpf_prog *prog)
         tcf_unbind_filter(tp, &prog->res);
         tcf_exts_destroy(tp, &prog->exts);
 
-        sk_unattached_filter_destroy(prog->filter);
+        bpf_prog_destroy(prog->filter);
 
         kfree(prog->bpf_ops);
         kfree(prog);
@@ -161,7 +161,7 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp,
         struct sock_filter *bpf_ops, *bpf_old;
         struct tcf_exts exts;
         struct sock_fprog_kern tmp;
-        struct sk_filter *fp, *fp_old;
+        struct bpf_prog *fp, *fp_old;
         u16 bpf_size, bpf_len;
         u32 classid;
         int ret;
@@ -193,7 +193,7 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp,
         tmp.len = bpf_len;
         tmp.filter = bpf_ops;
 
-        ret = sk_unattached_filter_create(&fp, &tmp);
+        ret = bpf_prog_create(&fp, &tmp);
         if (ret)
                 goto errout_free;
 
@@ -211,7 +211,7 @@ static int cls_bpf_modify_existing(struct net *net, struct tcf_proto *tp,
         tcf_exts_change(tp, &prog->exts, &exts);
 
         if (fp_old)
-                sk_unattached_filter_destroy(fp_old);
+                bpf_prog_destroy(fp_old);
         if (bpf_old)
                 kfree(bpf_old);
 
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index c721cd4a469f..3e9f76413b3b 100644
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -420,7 +420,7 @@ static void tcindex_destroy(struct tcf_proto *tp)
         pr_debug("tcindex_destroy(tp %p),p %p\n", tp, p);
         walker.count = 0;
         walker.skip = 0;
-        walker.fn = &tcindex_destroy_element;
+        walker.fn = tcindex_destroy_element;
         tcindex_walk(tp, &walker);
         kfree(p->perfect);
         kfree(p->h);
diff --git a/net/sched/em_canid.c b/net/sched/em_canid.c
index bfd34e4c1afc..7c292d474f47 100644
--- a/net/sched/em_canid.c
+++ b/net/sched/em_canid.c
@@ -125,7 +125,6 @@ static int em_canid_change(struct tcf_proto *tp, void *data, int len,
 {
         struct can_filter *conf = data; /* Array with rules */
         struct canid_match *cm;
-        struct canid_match *cm_old = (struct canid_match *)m->data;
         int i;
 
         if (!len)
@@ -181,12 +180,6 @@ static int em_canid_change(struct tcf_proto *tp, void *data, int len,
 
         m->datalen = sizeof(struct canid_match) + len;
         m->data = (unsigned long)cm;
-
-        if (cm_old != NULL) {
-                pr_err("canid: Configuring an existing ematch!\n");
-                kfree(cm_old);
-        }
-
         return 0;
 }
 
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index 3a633debb6df..ad57f4444b9c 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -526,9 +526,11 @@ pop_stack:
                 match_idx = stack[--stackp];
                 cur_match = tcf_em_get_match(tree, match_idx);
 
-                if (tcf_em_early_end(cur_match, res))
+                if (tcf_em_early_end(cur_match, res)) {
+                        if (tcf_em_is_inverted(cur_match))
+                                res = !res;
                         goto pop_stack;
-                else {
+                } else {
                         match_idx++;
                         goto proceed;
                 }
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index ead526467cca..762a04bb8f6d 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -159,7 +159,6 @@ struct cbq_sched_data {
         struct cbq_class        *tx_borrowed;
         int                     tx_len;
         psched_time_t           now;            /* Cached timestamp */
-        psched_time_t           now_rt;         /* Cached real time */
         unsigned int            pmask;
 
         struct hrtimer          delay_timer;
@@ -353,12 +352,7 @@ cbq_mark_toplevel(struct cbq_sched_data *q, struct cbq_class *cl)
         int toplevel = q->toplevel;
 
         if (toplevel > cl->level && !(qdisc_is_throttled(cl->q))) {
-                psched_time_t now;
-                psched_tdiff_t incr;
-
-                now = psched_get_time();
-                incr = now - q->now_rt;
-                now = q->now + incr;
+                psched_time_t now = psched_get_time();
 
                 do {
                         if (cl->undertime < now) {
@@ -700,8 +694,13 @@ cbq_update(struct cbq_sched_data *q)
         struct cbq_class *this = q->tx_class;
         struct cbq_class *cl = this;
         int len = q->tx_len;
+        psched_time_t now;
 
         q->tx_class = NULL;
+        /* Time integrator. We calculate EOS time
+         * by adding expected packet transmission time.
+         */
+        now = q->now + L2T(&q->link, len);
 
         for ( ; cl; cl = cl->share) {
                 long avgidle = cl->avgidle;
@@ -717,7 +716,7 @@ cbq_update(struct cbq_sched_data *q)
                  *      idle = (now - last) - last_pktlen/rate
                  */
 
-                idle = q->now - cl->last;
+                idle = now - cl->last;
                 if ((unsigned long)idle > 128*1024*1024) {
                         avgidle = cl->maxidle;
                 } else {
@@ -761,7 +760,7 @@ cbq_update(struct cbq_sched_data *q)
                         idle -= L2T(&q->link, len);
                         idle += L2T(cl, len);
 
-                        cl->undertime = q->now + idle;
+                        cl->undertime = now + idle;
                 } else {
                         /* Underlimit */
 
@@ -771,7 +770,8 @@ cbq_update(struct cbq_sched_data *q)
                         else
                                 cl->avgidle = avgidle;
                 }
-                cl->last = q->now;
+                if ((s64)(now - cl->last) > 0)
+                        cl->last = now;
         }
 
         cbq_update_toplevel(q, this, q->tx_borrowed);
@@ -943,31 +943,13 @@ cbq_dequeue(struct Qdisc *sch)
         struct sk_buff *skb;
         struct cbq_sched_data *q = qdisc_priv(sch);
         psched_time_t now;
-        psched_tdiff_t incr;
 
         now = psched_get_time();
-        incr = now - q->now_rt;
-
-        if (q->tx_class) {
-                psched_tdiff_t incr2;
-                /* Time integrator. We calculate EOS time
-                 * by adding expected packet transmission time.
-                 * If real time is greater, we warp artificial clock,
-                 * so that:
-                 *
-                 * cbq_time = max(real_time, work);
-                 */
-                incr2 = L2T(&q->link, q->tx_len);
-                q->now += incr2;
+
+        if (q->tx_class)
                 cbq_update(q);
-                if ((incr -= incr2) < 0)
-                        incr = 0;
-                q->now += incr;
-        } else {
-                if (now > q->now)
-                        q->now = now;
-        }
-        q->now_rt = now;
+
+        q->now = now;
 
         for (;;) {
                 q->wd_expires = 0;
@@ -1223,7 +1205,6 @@ cbq_reset(struct Qdisc *sch)
         hrtimer_cancel(&q->delay_timer);
         q->toplevel = TC_CBQ_MAXLEVEL;
         q->now = psched_get_time();
-        q->now_rt = q->now;
 
         for (prio = 0; prio <= TC_CBQ_MAXPRIO; prio++)
                 q->active[prio] = NULL;
@@ -1407,7 +1388,6 @@ static int cbq_init(struct Qdisc *sch, struct nlattr *opt)
         q->delay_timer.function = cbq_undelay;
         q->toplevel = TC_CBQ_MAXLEVEL;
         q->now = psched_get_time();
-        q->now_rt = q->now;
 
         cbq_link_class(&q->link);
 
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index ed30e436128b..fb666d1e4de3 100644
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -133,10 +133,16 @@ static void choke_drop_by_idx(struct Qdisc *sch, unsigned int idx)
         --sch->q.qlen;
 }
 
+/* private part of skb->cb[] that a qdisc is allowed to use
+ * is limited to QDISC_CB_PRIV_LEN bytes.
+ * As a flow key might be too large, we store a part of it only.
+ */
+#define CHOKE_K_LEN min_t(u32, sizeof(struct flow_keys), QDISC_CB_PRIV_LEN - 3)
+
 struct choke_skb_cb {
         u16                     classid;
         u8                      keys_valid;
-        struct flow_keys        keys;
+        u8                      keys[QDISC_CB_PRIV_LEN - 3];
 };
 
 static inline struct choke_skb_cb *choke_skb_cb(const struct sk_buff *skb)
@@ -163,22 +169,26 @@ static u16 choke_get_classid(const struct sk_buff *skb)
 static bool choke_match_flow(struct sk_buff *skb1,
                              struct sk_buff *skb2)
 {
+        struct flow_keys temp;
+
         if (skb1->protocol != skb2->protocol)
                 return false;
 
         if (!choke_skb_cb(skb1)->keys_valid) {
                 choke_skb_cb(skb1)->keys_valid = 1;
-                skb_flow_dissect(skb1, &choke_skb_cb(skb1)->keys);
+                skb_flow_dissect(skb1, &temp);
+                memcpy(&choke_skb_cb(skb1)->keys, &temp, CHOKE_K_LEN);
         }
 
         if (!choke_skb_cb(skb2)->keys_valid) {
                 choke_skb_cb(skb2)->keys_valid = 1;
-                skb_flow_dissect(skb2, &choke_skb_cb(skb2)->keys);
+                skb_flow_dissect(skb2, &temp);
+                memcpy(&choke_skb_cb(skb2)->keys, &temp, CHOKE_K_LEN);
         }
 
         return !memcmp(&choke_skb_cb(skb1)->keys,
                        &choke_skb_cb(skb2)->keys,
-                       sizeof(struct flow_keys));
+                       CHOKE_K_LEN);
 }
 
 /*
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index e1543b03e39d..fc04fe93c2da 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -108,7 +108,7 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb,
 
 /*
  * Transmit one skb, and handle the return status as required. Holding the
- * __QDISC_STATE_RUNNING bit guarantees that only one CPU can execute this
+ * __QDISC___STATE_RUNNING bit guarantees that only one CPU can execute this
  * function.
  *
  * Returns to the caller:
@@ -156,7 +156,7 @@ int sch_direct_xmit(struct sk_buff *skb, struct Qdisc *q,
 /*
  * NOTE: Called under qdisc_lock(q) with locally disabled BH.
  *
- * __QDISC_STATE_RUNNING guarantees only one CPU can process
+ * __QDISC___STATE_RUNNING guarantees only one CPU can process
  * this qdisc at a time. qdisc_lock(q) serializes queue accesses for
  * this queue.
  *
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 474167162947..bd33793b527e 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -485,8 +485,8 @@ static int __init teql_init(void)
                 struct net_device *dev;
                 struct teql_master *master;
 
-                dev = alloc_netdev(sizeof(struct teql_master),
-                                  "teql%d", teql_master_setup);
+                dev = alloc_netdev(sizeof(struct teql_master), "teql%d",
+                                   NET_NAME_UNKNOWN, teql_master_setup);
                 if (!dev) {
                         err = -ENOMEM;
                         break;