aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/core/fib_rules.c2
-rw-r--r--net/ipv4/fib_rules.c2
-rw-r--r--net/ipv6/fib6_rules.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index d1a70ad4b544..ef0e7d9e664b 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -287,7 +287,7 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
287 rule->flags = frh->flags; 287 rule->flags = frh->flags;
288 rule->table = frh_get_table(frh, tb); 288 rule->table = frh_get_table(frh, tb);
289 289
290 if (!rule->pref && ops->default_pref) 290 if (!tb[FRA_PRIORITY] && ops->default_pref)
291 rule->pref = ops->default_pref(ops); 291 rule->pref = ops->default_pref(ops);
292 292
293 err = -EINVAL; 293 err = -EINVAL;
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 835262c2b867..1239ed23cab6 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -284,7 +284,7 @@ static int fib_default_rules_init(struct fib_rules_ops *ops)
284{ 284{
285 int err; 285 int err;
286 286
287 err = fib_default_rule_add(ops, 0, RT_TABLE_LOCAL, FIB_RULE_PERMANENT); 287 err = fib_default_rule_add(ops, 0, RT_TABLE_LOCAL, 0);
288 if (err < 0) 288 if (err < 0)
289 return err; 289 return err;
290 err = fib_default_rule_add(ops, 0x7FFE, RT_TABLE_MAIN, 0); 290 err = fib_default_rule_add(ops, 0x7FFE, RT_TABLE_MAIN, 0);
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 00a7a5e4ac97..3b38f49f2c28 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -276,7 +276,7 @@ static int fib6_rules_net_init(struct net *net)
276 INIT_LIST_HEAD(&net->ipv6.fib6_rules_ops->rules_list); 276 INIT_LIST_HEAD(&net->ipv6.fib6_rules_ops->rules_list);
277 277
278 err = fib_default_rule_add(net->ipv6.fib6_rules_ops, 0, 278 err = fib_default_rule_add(net->ipv6.fib6_rules_ops, 0,
279 RT6_TABLE_LOCAL, FIB_RULE_PERMANENT); 279 RT6_TABLE_LOCAL, 0);
280 if (err) 280 if (err)
281 goto out_fib6_rules_ops; 281 goto out_fib6_rules_ops;
282 282