diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-05 10:12:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-05 10:13:24 -0500 |
| commit | 1032c736e81cdf490ae62f86da7efe67c3c3e61d (patch) | |
| tree | a0c3919849f97dbbc5ea7c6a9ac1d7a639e44a73 /net/nfc/netlink.c | |
| parent | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 (diff) | |
| parent | cb00ec382b57d35b955c085198cd54a0c1fcdc94 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/b43legacy/dma.c
Diffstat (limited to 'net/nfc/netlink.c')
| -rw-r--r-- | net/nfc/netlink.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index 43a1c47756a..6989dfa28ee 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -67,6 +67,9 @@ static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target, target->supported_protocols); NLA_PUT_U16(msg, NFC_ATTR_TARGET_SENS_RES, target->sens_res); NLA_PUT_U8(msg, NFC_ATTR_TARGET_SEL_RES, target->sel_res); + if (target->nfcid1_len > 0) + NLA_PUT(msg, NFC_ATTR_TARGET_NFCID1, target->nfcid1_len, + target->nfcid1); return genlmsg_end(msg, hdr); |