projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
net
/
core
/
sock.c
diff --git
a/net/core/sock.c
b/net/core/sock.c
index a692ef49c9bb9b2d996f0538049a135a93c26812..bc131d419683c11bd6f098c930e7d4f3cd9fb697 100644
(file)
--- a/
net/core/sock.c
+++ b/
net/core/sock.c
@@
-583,7
+583,7
@@
static int sock_getbindtodevice(struct sock *sk, char __user *optval,
goto out;
retry:
goto out;
retry:
- seq = read_seqbegin(&devnet_rename_seq);
+ seq = read_seq
count_
begin(&devnet_rename_seq);
rcu_read_lock();
dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if);
ret = -ENODEV;
rcu_read_lock();
dev = dev_get_by_index_rcu(net, sk->sk_bound_dev_if);
ret = -ENODEV;
@@
-594,7
+594,7
@@
retry:
strcpy(devname, dev->name);
rcu_read_unlock();
strcpy(devname, dev->name);
rcu_read_unlock();
- if (read_seqretry(&devnet_rename_seq, seq))
+ if (read_seq
count_
retry(&devnet_rename_seq, seq))
goto retry;
len = strlen(devname) + 1;
goto retry;
len = strlen(devname) + 1;