summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-11-06 18:20:41 +0800
committerSamuel Ortiz <sameo@linux.intel.com>2014-11-28 13:41:44 +0100
commit413df10bbf09e8ab1e2659126af849b4c9f3a3e3 (patch)
treec84a0f78205b7c1430d5e4403e4ec077ea9336e7
parentdb083bcbca77c0ebc1b13d5707fcaffe6711493d (diff)
downloadlinux-stable-413df10bbf09e8ab1e2659126af849b4c9f3a3e3.tar.gz
linux-stable-413df10bbf09e8ab1e2659126af849b4c9f3a3e3.tar.bz2
linux-stable-413df10bbf09e8ab1e2659126af849b4c9f3a3e3.zip
NFC: llcp: Use list_for_each_entry in llcp_accept_poll
list_for_each_entry_safe() is necessary if list objects are deleted from the list while traversing it. Not the case here, so we can use the base list_for_each_entry variant. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--net/nfc/llcp_sock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index 51f077a92fa9..4894c415c441 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -524,13 +524,13 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *uaddr,
static inline unsigned int llcp_accept_poll(struct sock *parent)
{
- struct nfc_llcp_sock *llcp_sock, *n, *parent_sock;
+ struct nfc_llcp_sock *llcp_sock, *parent_sock;
struct sock *sk;
parent_sock = nfc_llcp_sock(parent);
- list_for_each_entry_safe(llcp_sock, n, &parent_sock->accept_queue,
- accept_queue) {
+ list_for_each_entry(llcp_sock, &parent_sock->accept_queue,
+ accept_queue) {
sk = &llcp_sock->sk;
if (sk->sk_state == LLCP_CONNECTED)