* [PATCH v3] cls_flower: Fix compile error
@ 2015-05-14 17:20 Brian Haley
2015-05-14 17:34 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Brian Haley @ 2015-05-14 17:20 UTC (permalink / raw)
To: netdev@vger•kernel.org; +Cc: Jiri Pirko, David Miller
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>
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 9bc654c..8c8f34e 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,
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v3] cls_flower: Fix compile error
2015-05-14 17:20 [PATCH v3] cls_flower: Fix compile error Brian Haley
@ 2015-05-14 17:34 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2015-05-14 17:34 UTC (permalink / raw)
To: brian.haley; +Cc: netdev, jiri
From: Brian Haley <brian.haley@hp•com>
Date: Thu, 14 May 2015 13:20:15 -0400
> 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>
Applied, thanks Brian.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-14 17:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-14 17:20 [PATCH v3] cls_flower: Fix compile error Brian Haley
2015-05-14 17:34 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox