summaryrefslogtreecommitdiffstats
path: root/net/nfc/llcp.h
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-05-03 18:29:30 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-14 13:45:07 +0200
commitb4011239a08e7e6c2c6e970dfa9e8ecb73139261 (patch)
treebdb25a99be7021b952d387b9b2a264741aae0e94 /net/nfc/llcp.h
parent7cbe0ff3e475b7268ad9b55057048b2299fd60e0 (diff)
downloadlinux-b4011239a08e7e6c2c6e970dfa9e8ecb73139261.tar.gz
linux-b4011239a08e7e6c2c6e970dfa9e8ecb73139261.tar.bz2
linux-b4011239a08e7e6c2c6e970dfa9e8ecb73139261.zip
NFC: llcp: Fix non blocking sockets connections
Without the new LLCP_CONNECTING state, non blocking sockets will be woken up with a POLLHUP right after calling connect() because their state is stuck at LLCP_CLOSED. That prevents userspace from implementing any proper non blocking socket based NFC p2p client. Cc: stable@vger.kernel.org Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/llcp.h')
-rw-r--r--net/nfc/llcp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/nfc/llcp.h b/net/nfc/llcp.h
index 71f649e5ef49..f4d48b57ea11 100644
--- a/net/nfc/llcp.h
+++ b/net/nfc/llcp.h
@@ -19,6 +19,7 @@
enum llcp_state {
LLCP_CONNECTED = 1, /* wait_for_packet() wants that */
+ LLCP_CONNECTING,
LLCP_DISCONNECTING,
LLCP_CLOSED,
LLCP_BOUND,