Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 193600
b: refs/heads/master
c: 2fb3573
h: refs/heads/master
v: v3
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Mar 17, 2010
1 parent 005a552 commit 177ae41
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 14bb4789833a2e2610f30e2d3e1451701ac96ec1
refs/heads/master: 2fb3573dfbca0bd853ddc1e47617eb446fa3deae
10 changes: 2 additions & 8 deletions trunk/net/core/fib_rules.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fib_rules_register(struct fib_rules_ops *tmpl, struct net *net)
struct fib_rules_ops *ops;
int err;

ops = kmemdup(tmpl, sizeof (*ops), GFP_KERNEL);
ops = kmemdup(tmpl, sizeof(*ops), GFP_KERNEL);
if (ops == NULL)
return ERR_PTR(-ENOMEM);

Expand All @@ -123,7 +123,6 @@ fib_rules_register(struct fib_rules_ops *tmpl, struct net *net)

return ops;
}

EXPORT_SYMBOL_GPL(fib_rules_register);

void fib_rules_cleanup_ops(struct fib_rules_ops *ops)
Expand Down Expand Up @@ -157,7 +156,6 @@ void fib_rules_unregister(struct fib_rules_ops *ops)

call_rcu(&ops->rcu, fib_rules_put_rcu);
}

EXPORT_SYMBOL_GPL(fib_rules_unregister);

static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops,
Expand Down Expand Up @@ -220,7 +218,6 @@ int fib_rules_lookup(struct fib_rules_ops *ops, struct flowi *fl,

return err;
}

EXPORT_SYMBOL_GPL(fib_rules_lookup);

static int validate_rulemsg(struct fib_rule_hdr *frh, struct nlattr **tb,
Expand Down Expand Up @@ -613,7 +610,7 @@ static int fib_nl_dumprule(struct sk_buff *skb, struct netlink_callback *cb)
break;

cb->args[1] = 0;
skip:
skip:
idx++;
}
rcu_read_unlock();
Expand Down Expand Up @@ -685,7 +682,6 @@ static int fib_rules_event(struct notifier_block *this, unsigned long event,
struct fib_rules_ops *ops;

ASSERT_RTNL();
rcu_read_lock();

switch (event) {
case NETDEV_REGISTER:
Expand All @@ -699,8 +695,6 @@ static int fib_rules_event(struct notifier_block *this, unsigned long event,
break;
}

rcu_read_unlock();

return NOTIFY_DONE;
}

Expand Down

0 comments on commit 177ae41

Please sign in to comment.