fib: remove unnecessary input parameters in fib_default_rule_add

When fib_default_rule_add is invoked, the value of the input parameter
'flags' is always 0. Rules uses kzalloc to allocate memory, so 'flags' has
been initialized to 0. Therefore, remove the input parameter 'flags' in
fib_default_rule_add.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20240102071519.3781384-1-shaozhengchao@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index 82da359bca035dc0ebfc019cc6d07acb5be77082..d17855c52ef926383f2585a6f31094899f1e7908 100644 (file)
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -172,8 +172,7 @@ void fib_rules_unregister(struct fib_rules_ops *);
 
 int fib_rules_lookup(struct fib_rules_ops *, struct flowi *, int flags,
                     struct fib_lookup_arg *);
-int fib_default_rule_add(struct fib_rules_ops *, u32 pref, u32 table,
-                        u32 flags);
+int fib_default_rule_add(struct fib_rules_ops *, u32 pref, u32 table);
 bool fib_rule_matchall(const struct fib_rule *rule);
 int fib_rules_dump(struct net *net, struct notifier_block *nb, int family,
                   struct netlink_ext_ack *extack);

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 75282222e0b4567ce35e89246921c8fd8bd874c9..96622bfb838ab2382563ee0ec5585c5d2bf65dcd 100644 (file)
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -53,7 +53,7 @@ bool fib_rule_matchall(const struct fib_rule *rule)
 EXPORT_SYMBOL_GPL(fib_rule_matchall);
 
 int fib_default_rule_add(struct fib_rules_ops *ops,
-                        u32 pref, u32 table, u32 flags)
+                        u32 pref, u32 table)
 {
        struct fib_rule *r;
 
@@ -65,7 +65,6 @@ int fib_default_rule_add(struct fib_rules_ops *ops,
        r->action = FR_ACT_TO_TBL;
        r->pref = pref;
        r->table = table;
-       r->flags = flags;
        r->proto = RTPROT_KERNEL;
        r->fr_net = ops->fro_net;
        r->uid_range = fib_kuid_range_unset;

diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 513f475c6a534e0fb406b93525476ac9c03f3bc8..5bdd1c016009442f55cba04d66d5331e76597e6c 100644 (file)
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -395,13 +395,13 @@ static int fib_default_rules_init(struct fib_rules_ops *ops)
 {
        int err;
 
-       err = fib_default_rule_add(ops, 0, RT_TABLE_LOCAL, 0);
+       err = fib_default_rule_add(ops, 0, RT_TABLE_LOCAL);
        if (err < 0)
                return err;
-       err = fib_default_rule_add(ops, 0x7FFE, RT_TABLE_MAIN, 0);
+       err = fib_default_rule_add(ops, 0x7FFE, RT_TABLE_MAIN);
        if (err < 0)
                return err;
-       err = fib_default_rule_add(ops, 0x7FFF, RT_TABLE_DEFAULT, 0);
+       err = fib_default_rule_add(ops, 0x7FFF, RT_TABLE_DEFAULT);
        if (err < 0)
                return err;
        return 0;

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 0063a237253bf4c7759f4a2d6ec77788f66c20a8..9d6f59531b3a0b0bc082e1f1febf4568368580b9 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -253,7 +253,7 @@ static int __net_init ipmr_rules_init(struct net *net)
                goto err1;
        }
 
-       err = fib_default_rule_add(ops, 0x7fff, RT_TABLE_DEFAULT, 0);
+       err = fib_default_rule_add(ops, 0x7fff, RT_TABLE_DEFAULT);
        if (err < 0)
                goto err2;
 

diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 7c20038330104e9c1dd9f93f38667cff9a0fadc0..7523c4baef35e23d39e9537943593107a79ff551 100644 (file)
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -475,11 +475,11 @@ static int __net_init fib6_rules_net_init(struct net *net)
        if (IS_ERR(ops))
                return PTR_ERR(ops);
 
-       err = fib_default_rule_add(ops, 0, RT6_TABLE_LOCAL, 0);
+       err = fib_default_rule_add(ops, 0, RT6_TABLE_LOCAL);
        if (err)
                goto out_fib6_rules_ops;
 
-       err = fib_default_rule_add(ops, 0x7FFE, RT6_TABLE_MAIN, 0);
+       err = fib_default_rule_add(ops, 0x7FFE, RT6_TABLE_MAIN);
        if (err)
                goto out_fib6_rules_ops;
 

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 30ca064b76ef1798d249fa4266bef34668d6a811..9782c180fee646ab0fad7f0f911254b4b3a592c4 100644 (file)
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -242,7 +242,7 @@ static int __net_init ip6mr_rules_init(struct net *net)
                goto err1;
        }
 
-       err = fib_default_rule_add(ops, 0x7fff, RT6_TABLE_DFLT, 0);
+       err = fib_default_rule_add(ops, 0x7fff, RT6_TABLE_DFLT);
        if (err < 0)
                goto err2;