Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 171178
b: refs/heads/master
c: 122ec6f
h: refs/heads/master
v: v3
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Nov 6, 2009
1 parent 21a94af commit 9736143
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 31ef30c760f7ddb133fa538df1dfbec1f42294d7
refs/heads/master: 122ec6ffca3967ffaa96a4c7a5dc9cd71866e0bc
6 changes: 2 additions & 4 deletions trunk/net/netlabel/netlabel_unlabeled.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,13 +472,12 @@ int netlbl_unlhsh_add(struct net *net,

rcu_read_lock();
if (dev_name != NULL) {
dev = dev_get_by_name(net, dev_name);
dev = dev_get_by_name_rcu(net, dev_name);
if (dev == NULL) {
ret_val = -ENODEV;
goto unlhsh_add_return;
}
ifindex = dev->ifindex;
dev_put(dev);
iface = netlbl_unlhsh_search_iface(ifindex);
} else {
ifindex = 0;
Expand Down Expand Up @@ -737,13 +736,12 @@ int netlbl_unlhsh_remove(struct net *net,

rcu_read_lock();
if (dev_name != NULL) {
dev = dev_get_by_name(net, dev_name);
dev = dev_get_by_name_rcu(net, dev_name);
if (dev == NULL) {
ret_val = -ENODEV;
goto unlhsh_remove_return;
}
iface = netlbl_unlhsh_search_iface(dev->ifindex);
dev_put(dev);
} else
iface = rcu_dereference(netlbl_unlhsh_def);
if (iface == NULL) {
Expand Down

0 comments on commit 9736143

Please sign in to comment.