diff options
Diffstat (limited to 'net/sched/em_meta.c')
-rw-r--r-- | net/sched/em_meta.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 45d47d37155e..60acf8cdb27b 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Authors: Thomas Graf <tgraf@suug.ch> | 9 | * Authors: Thomas Graf <tgraf@suug.ch> |
10 | * | 10 | * |
11 | * ========================================================================== | 11 | * ========================================================================== |
12 | * | 12 | * |
13 | * The metadata ematch compares two meta objects where each object | 13 | * The metadata ematch compares two meta objects where each object |
14 | * represents either a meta value stored in the kernel or a static | 14 | * represents either a meta value stored in the kernel or a static |
15 | * value provided by userspace. The objects are not provided by | 15 | * value provided by userspace. The objects are not provided by |
@@ -290,7 +290,7 @@ META_COLLECTOR(var_sk_bound_if) | |||
290 | dst->len = 3; | 290 | dst->len = 3; |
291 | } else { | 291 | } else { |
292 | struct net_device *dev; | 292 | struct net_device *dev; |
293 | 293 | ||
294 | dev = dev_get_by_index(skb->sk->sk_bound_dev_if); | 294 | dev = dev_get_by_index(skb->sk->sk_bound_dev_if); |
295 | *err = var_dev(dev, dst); | 295 | *err = var_dev(dev, dst); |
296 | if (dev) | 296 | if (dev) |
@@ -671,7 +671,7 @@ static inline struct meta_type_ops * meta_type_ops(struct meta_value *v) | |||
671 | * Core | 671 | * Core |
672 | **************************************************************************/ | 672 | **************************************************************************/ |
673 | 673 | ||
674 | static inline int meta_get(struct sk_buff *skb, struct tcf_pkt_info *info, | 674 | static inline int meta_get(struct sk_buff *skb, struct tcf_pkt_info *info, |
675 | struct meta_value *v, struct meta_obj *dst) | 675 | struct meta_value *v, struct meta_obj *dst) |
676 | { | 676 | { |
677 | int err = 0; | 677 | int err = 0; |
@@ -753,7 +753,7 @@ static int em_meta_change(struct tcf_proto *tp, void *data, int len, | |||
753 | struct rtattr *tb[TCA_EM_META_MAX]; | 753 | struct rtattr *tb[TCA_EM_META_MAX]; |
754 | struct tcf_meta_hdr *hdr; | 754 | struct tcf_meta_hdr *hdr; |
755 | struct meta_match *meta = NULL; | 755 | struct meta_match *meta = NULL; |
756 | 756 | ||
757 | if (rtattr_parse(tb, TCA_EM_META_MAX, data, len) < 0) | 757 | if (rtattr_parse(tb, TCA_EM_META_MAX, data, len) < 0) |
758 | goto errout; | 758 | goto errout; |
759 | 759 | ||
@@ -822,7 +822,7 @@ static int em_meta_dump(struct sk_buff *skb, struct tcf_ematch *em) | |||
822 | 822 | ||
823 | rtattr_failure: | 823 | rtattr_failure: |
824 | return -1; | 824 | return -1; |
825 | } | 825 | } |
826 | 826 | ||
827 | static struct tcf_ematch_ops em_meta_ops = { | 827 | static struct tcf_ematch_ops em_meta_ops = { |
828 | .kind = TCF_EM_META, | 828 | .kind = TCF_EM_META, |
@@ -839,7 +839,7 @@ static int __init init_em_meta(void) | |||
839 | return tcf_em_register(&em_meta_ops); | 839 | return tcf_em_register(&em_meta_ops); |
840 | } | 840 | } |
841 | 841 | ||
842 | static void __exit exit_em_meta(void) | 842 | static void __exit exit_em_meta(void) |
843 | { | 843 | { |
844 | tcf_em_unregister(&em_meta_ops); | 844 | tcf_em_unregister(&em_meta_ops); |
845 | } | 845 | } |