diff options
| author |   Jiri Pirko <jiri@mellanox.com> | 2019-06-15 11:03:49 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-06-15 14:06:13 -0700 |
| commit | a51486266c3ba8e035a47fa96df67f274fe0c7d0 (patch) | |
| tree | 2d0cd2c81384ecf30958dc563d8ebacb4bbc0816 /net/sched/cls_flower.c | |
| parent | r8169: improve handling of Abit Fatal1ty F-190HD (diff) | |
| download | linux-dev-a51486266c3ba8e035a47fa96df67f274fe0c7d0.tar.xz linux-dev-a51486266c3ba8e035a47fa96df67f274fe0c7d0.zip | |
net: sched: remove NET_CLS_IND config option
This config option makes only couple of lines optional.
Two small helpers and an int in couple of cls structs.
Remove the config option and always compile this in.
This saves the user from unexpected surprises when he adds
a filter with ingress device match which is silently ignored
in case the config option is not set.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/sched/cls_flower.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index c388372df0e2..84c7f279855b 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1010,7 +1010,7 @@ 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) @@ -1018,7 +1018,6 @@ static int fl_set_key(struct net *net, struct nlattr **tb, 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, |