summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorBrian Haley <brian.haley@hp.com>2015-05-14 13:20:15 -0400
committerDavid S. Miller <davem@davemloft.net>2015-05-14 13:34:35 -0400
commitdd3aa3b5fbf61adb0ef5d44a6753646b767b9c77 (patch)
tree1912536ccc927df3b9b769b3f434e8947244b943 /net
parentb55b10bebb86a436bebd5c754f80076ad51f4068 (diff)
downloadlinux-stable-dd3aa3b5fbf61adb0ef5d44a6753646b767b9c77.tar.gz
linux-stable-dd3aa3b5fbf61adb0ef5d44a6753646b767b9c77.tar.bz2
linux-stable-dd3aa3b5fbf61adb0ef5d44a6753646b767b9c77.zip
cls_flower: Fix compile error
Fix compile error in net/sched/cls_flower.c net/sched/cls_flower.c: In function ‘fl_set_key’: net/sched/cls_flower.c:240:3: error: implicit declaration of function ‘tcf_change_indev’ [-Werror=implicit-function-declaration] err = tcf_change_indev(net, tb[TCA_FLOWER_INDEV]); Introduced in 77b9900ef53ae Fixes: 77b9900ef53ae ("tc: introduce Flower classifier") Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/cls_flower.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 9bc654c764cd..8c8f34ef6980 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -234,15 +234,15 @@ static void fl_set_key_val(struct nlattr **tb,
static int fl_set_key(struct net *net, struct nlattr **tb,
struct fl_flow_key *key, struct fl_flow_key *mask)
{
- int err;
-
+#ifdef CONFIG_NET_CLS_IND
if (tb[TCA_FLOWER_INDEV]) {
- err = tcf_change_indev(net, tb[TCA_FLOWER_INDEV]);
+ int err = tcf_change_indev(net, tb[TCA_FLOWER_INDEV]);
if (err < 0)
return err;
key->indev_ifindex = err;
mask->indev_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,