summaryrefslogtreecommitdiffstats
path: root/net/nfc/rawsock.c
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-10-25 22:54:43 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-27 03:55:12 +0100
commit96d4581f0b3712221d6ed4a765bb6b4ea40f2b2f (patch)
tree1d07dd46daa8b0b1c2aa0e3d3c7c4f9cd47b7fbe /net/nfc/rawsock.c
parentcde2aa99ba702ab8efa583495e54731b9f854e66 (diff)
downloadlinux-0-day-96d4581f0b3712221d6ed4a765bb6b4ea40f2b2f.tar.gz
linux-0-day-96d4581f0b3712221d6ed4a765bb6b4ea40f2b2f.tar.xz
NFC: netlink: Add mode parameter to deactivate_target functions
In order to manage in a better way the nci poll mode state machine, add mode parameter to deactivate_target functions. This way we can manage different target state. mode parameter make sense only in nci core. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/rawsock.c')
-rw-r--r--net/nfc/rawsock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c
index e9a91488fe3d3..e386e6c90b179 100644
--- a/net/nfc/rawsock.c
+++ b/net/nfc/rawsock.c
@@ -321,7 +321,8 @@ static void rawsock_destruct(struct sock *sk)
if (sk->sk_state == TCP_ESTABLISHED) {
nfc_deactivate_target(nfc_rawsock(sk)->dev,
- nfc_rawsock(sk)->target_idx);
+ nfc_rawsock(sk)->target_idx,
+ NFC_TARGET_MODE_IDLE);
nfc_put_device(nfc_rawsock(sk)->dev);
}