Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / net / sched / cls_flower.c

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index fdeede3af72e0595ae054df88aad4d6cd2e512b7..5d4935b51e6fb488666a3abed9986b342a7d03fc 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -27,7 +27,7 @@
 #include <net/dst_metadata.h>
 
 struct fl_flow_key {
-       int     indev_ifindex;
+       struct flow_dissector_key_meta meta;
        struct flow_dissector_key_control control;
        struct flow_dissector_key_control enc_control;
        struct flow_dissector_key_basic basic;
@@ -284,7 +284,7 @@ static int fl_classify(struct sk_buff *skb, const struct tcf_proto *tp,
        list_for_each_entry_rcu(mask, &head->masks, list) {
                fl_clear_masked_range(&skb_key, mask);
 
-               skb_key.indev_ifindex = skb->skb_iif;
+               skb_flow_dissect_meta(skb, &mask->dissector, &skb_key);
                /* skb_flow_dissect() does not set n_proto in case an unknown
                 * protocol, so do it rather here.
                 */
@@ -1003,15 +1003,14 @@ static int fl_set_key(struct net *net, struct nlattr **tb,
 {
        __be16 ethertype;
        int ret = 0;
-#ifdef CONFIG_NET_CLS_IND
+
        if (tb[TCA_FLOWER_INDEV]) {
                int err = tcf_change_indev(net, tb[TCA_FLOWER_INDEV], extack);
                if (err < 0)
                        return err;
-               key->indev_ifindex = err;
-               mask->indev_ifindex = 0xffffffff;
+               key->meta.ingress_ifindex = err;
+               mask->meta.ingress_ifindex = 0xffffffff;
        }
-#endif
 
        fl_set_key_val(tb, key->eth.dst, TCA_FLOWER_KEY_ETH_DST,
                       mask->eth.dst, TCA_FLOWER_KEY_ETH_DST_MASK,
@@ -1264,6 +1263,8 @@ static void fl_init_dissector(struct flow_dissector *dissector,
        struct flow_dissector_key keys[FLOW_DISSECTOR_KEY_MAX];
        size_t cnt = 0;
 
+       FL_KEY_SET_IF_MASKED(mask, keys, cnt,
+                            FLOW_DISSECTOR_KEY_META, meta);
        FL_KEY_SET(keys, cnt, FLOW_DISSECTOR_KEY_CONTROL, control);
        FL_KEY_SET(keys, cnt, FLOW_DISSECTOR_KEY_BASIC, basic);
        FL_KEY_SET_IF_MASKED(mask, keys, cnt,
@@ -2110,10 +2111,10 @@ static int fl_dump_key_enc_opt(struct sk_buff *skb,
 static int fl_dump_key(struct sk_buff *skb, struct net *net,
                       struct fl_flow_key *key, struct fl_flow_key *mask)
 {
-       if (mask->indev_ifindex) {
+       if (mask->meta.ingress_ifindex) {
                struct net_device *dev;
 
-               dev = __dev_get_by_index(net, key->indev_ifindex);
+               dev = __dev_get_by_index(net, key->meta.ingress_ifindex);
                if (dev && nla_put_string(skb, TCA_FLOWER_INDEV, dev->name))
                        goto nla_put_failure;
        }