diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-02-22 11:38:05 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-03-10 22:20:05 +0100 |
| commit | 06d44f806aafdafefec789583aba5f8bef301c0c (patch) | |
| tree | 20994de06b6e992acb62409c5f2905f9812bbd21 /net/nfc/llcp/llcp.c | |
| parent | 26fd76cab2e61cedc5c25f7151fb31b57ddc53c7 (diff) | |
| download | lwn-06d44f806aafdafefec789583aba5f8bef301c0c.tar.gz lwn-06d44f806aafdafefec789583aba5f8bef301c0c.zip | |
NFC: llcp: Use socket specific link parameters before the local ones
If the socket link options are set, use them before the local one.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/llcp/llcp.c')
| -rw-r--r-- | net/nfc/llcp/llcp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c index c0048b2395dd..8d547ae9c85b 100644 --- a/net/nfc/llcp/llcp.c +++ b/net/nfc/llcp/llcp.c @@ -865,6 +865,8 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *local, new_sock = nfc_llcp_sock(new_sk); new_sock->dev = local->dev; new_sock->local = nfc_llcp_local_get(local); + new_sock->rw = sock->rw; + new_sock->miux = sock->miux; new_sock->remote_miu = local->remote_miu; new_sock->nfc_protocol = sock->nfc_protocol; new_sock->dsap = ssap; |