diff options
| author | Thierry Escande <thierry.escande@linux.intel.com> | 2013-06-04 11:34:50 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-14 13:45:04 +0200 |
| commit | 58e3dd1558f56e95e7077a63340bb33e7aa42946 (patch) | |
| tree | e5f19793fdf552f815daa92cf90207cd4d61c8d9 /net/nfc/llcp_sock.c | |
| parent | 86eca4e71f41fb90800707cd05f580cd3e0cb836 (diff) | |
| download | linux-stable-58e3dd1558f56e95e7077a63340bb33e7aa42946.tar.gz linux-stable-58e3dd1558f56e95e7077a63340bb33e7aa42946.tar.bz2 linux-stable-58e3dd1558f56e95e7077a63340bb33e7aa42946.zip | |
NFC: Rename nfc_llcp_disconnect() to nfc_llcp_send_disconnect()
nfc_llcp_send_disconnect() already exists but is not used.
nfc_llcp_disconnect() naming is not consistent with other PDU
sending functions.
This patch removes nfc_llcp_send_disconnect() and renames
nfc_llcp_disconnect()
Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/llcp_sock.c')
| -rw-r--r-- | net/nfc/llcp_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index 380253eccb74..03fd3162cee5 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -603,7 +603,7 @@ static int llcp_sock_release(struct socket *sock) /* Send a DISC */ if (sk->sk_state == LLCP_CONNECTED) - nfc_llcp_disconnect(llcp_sock); + nfc_llcp_send_disconnect(llcp_sock); if (sk->sk_state == LLCP_LISTEN) { struct nfc_llcp_sock *lsk, *n; @@ -614,7 +614,7 @@ static int llcp_sock_release(struct socket *sock) accept_sk = &lsk->sk; lock_sock(accept_sk); - nfc_llcp_disconnect(lsk); + nfc_llcp_send_disconnect(lsk); nfc_llcp_accept_unlink(accept_sk); release_sock(accept_sk); |