Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Zhengchao Shao and committed by
Jakub Kicinski
b4c1d4d9 5fe65375

+9 -11
+1 -2
include/net/fib_rules.h
··· 172 172 173 173 int fib_rules_lookup(struct fib_rules_ops *, struct flowi *, int flags, 174 174 struct fib_lookup_arg *); 175 - int fib_default_rule_add(struct fib_rules_ops *, u32 pref, u32 table, 176 - u32 flags); 175 + int fib_default_rule_add(struct fib_rules_ops *, u32 pref, u32 table); 177 176 bool fib_rule_matchall(const struct fib_rule *rule); 178 177 int fib_rules_dump(struct net *net, struct notifier_block *nb, int family, 179 178 struct netlink_ext_ack *extack);
+1 -2
net/core/fib_rules.c
··· 53 53 EXPORT_SYMBOL_GPL(fib_rule_matchall); 54 54 55 55 int fib_default_rule_add(struct fib_rules_ops *ops, 56 - u32 pref, u32 table, u32 flags) 56 + u32 pref, u32 table) 57 57 { 58 58 struct fib_rule *r; 59 59 ··· 65 65 r->action = FR_ACT_TO_TBL; 66 66 r->pref = pref; 67 67 r->table = table; 68 - r->flags = flags; 69 68 r->proto = RTPROT_KERNEL; 70 69 r->fr_net = ops->fro_net; 71 70 r->uid_range = fib_kuid_range_unset;
+3 -3
net/ipv4/fib_rules.c
··· 395 395 { 396 396 int err; 397 397 398 - err = fib_default_rule_add(ops, 0, RT_TABLE_LOCAL, 0); 398 + err = fib_default_rule_add(ops, 0, RT_TABLE_LOCAL); 399 399 if (err < 0) 400 400 return err; 401 - err = fib_default_rule_add(ops, 0x7FFE, RT_TABLE_MAIN, 0); 401 + err = fib_default_rule_add(ops, 0x7FFE, RT_TABLE_MAIN); 402 402 if (err < 0) 403 403 return err; 404 - err = fib_default_rule_add(ops, 0x7FFF, RT_TABLE_DEFAULT, 0); 404 + err = fib_default_rule_add(ops, 0x7FFF, RT_TABLE_DEFAULT); 405 405 if (err < 0) 406 406 return err; 407 407 return 0;
+1 -1
net/ipv4/ipmr.c
··· 253 253 goto err1; 254 254 } 255 255 256 - err = fib_default_rule_add(ops, 0x7fff, RT_TABLE_DEFAULT, 0); 256 + err = fib_default_rule_add(ops, 0x7fff, RT_TABLE_DEFAULT); 257 257 if (err < 0) 258 258 goto err2; 259 259
+2 -2
net/ipv6/fib6_rules.c
··· 475 475 if (IS_ERR(ops)) 476 476 return PTR_ERR(ops); 477 477 478 - err = fib_default_rule_add(ops, 0, RT6_TABLE_LOCAL, 0); 478 + err = fib_default_rule_add(ops, 0, RT6_TABLE_LOCAL); 479 479 if (err) 480 480 goto out_fib6_rules_ops; 481 481 482 - err = fib_default_rule_add(ops, 0x7FFE, RT6_TABLE_MAIN, 0); 482 + err = fib_default_rule_add(ops, 0x7FFE, RT6_TABLE_MAIN); 483 483 if (err) 484 484 goto out_fib6_rules_ops; 485 485
+1 -1
net/ipv6/ip6mr.c
··· 242 242 goto err1; 243 243 } 244 244 245 - err = fib_default_rule_add(ops, 0x7fff, RT6_TABLE_DFLT, 0); 245 + err = fib_default_rule_add(ops, 0x7fff, RT6_TABLE_DFLT); 246 246 if (err < 0) 247 247 goto err2; 248 248