Skip to contentSkip to conversation

cls_flower: Fix compile error

PATCH Superseded Brian Haley 2 participants 2 messages May 14, 2015

Subsystems (3)
Networking Network drivers Traffic control (tc)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Brian Haley

author
#0 lore raw

PATCH v2 1/1 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 77b9900ef53ae047e36a37d13a2aa33bb2d60641

Signed-off-by Brian Haley <[email protected]>
net/sched/cls_flower.c +3 -3
index 9bc654c..8c8f34e 100644
@@ -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,
maintainer
#1 lore raw

From: Brian Haley <[email protected]>
Date: Thu, 14 May 2015 12:50:17 -0400

Quoted 16 lines

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 77b9900ef53ae047e36a37d13a2aa33bb2d60641

Signed-off-by Brian Haley <[email protected]>
net/sched/cls_flower.c +0 -0
index 9bc654c..8c8f34e 100644

net/sched/cls_flower.c static void fl_set_key_val(struct nlattr **tb, · line 238

Quoted 5 lines
net/sched/cls_flower.c +0 -2
@@ -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;
-

This patch is corrupted by your email client.

Also, referring to a guilty patch is done using the "Fixes: " tag which should appear right before your signoff. It is to be of the form:

Fixes $(SHA1_ID) ("Commit summary line text")

The SHA1_ID should be of 12 characters of significance.