This is the first NFC pull request for 3.10.
The 2 features we have with this one are: - An LLCP Service Name Lookup (SNL) netlink interface for querying LLCP service availability from user space. Along the way, Thierry also improved the existing SNL interface for aggregating SNL responses. - An initial LLCP socket options implementation, for setting the Receive Window (RW) and the Maximum Information Unit Extension (MIUX) per socket. This is need for the LLCP validation tests. We also have a microread MEI build failure here: I am not sending this one to 3.9 because the MEI bus code is not there yet, so it won't break for anyone else than me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJRPQegAAoJEIqAPN1PVmxKqJgP/AzPubNeDM48BCWpt+tXEWGB uAeClwn4NJwNNxX4KrgV+WUJ4ZfK5A2gGSIjsEXUFumPP5DoekoZV5Vx03UycjOP vDi/eyLMj8+DPfbx75rOEqnwfnyN6qLsN5lzUY2AFgT1L9J0w+3yY0Fuyo6ZjWOD 0REKbtInjDJSji6t0SWZ/Rx5Ww9rds6xJs/p+1x13BHz3efBRVBWxCMhNgvaNhOH iAV3Zi53lMNMQs2/PkIdjE59HngZCWjgJng3GTy9zh5GdKB4QrDFchtNb9rV0d0T x99tBvoPLJzudYO81cRIdeKe5tIr30YLcrh5Ow7ApXdnoaKTuoI3+POvnyyucUzM FwoBG/M5N4ok7YMBEyu6E2CiLULD27NmDocEirlkvcAfA8gJoYzIF6JZ9YcmeZTT JPqoElD+qpr0sScLAgR+NK8g1tPdHZof6x6tH59IOK0Kg4TM2rGSeqhNXLIdb/QG qRLV27lhZrVayJVpGeS0tX/EekgpRsrb9mAcUQcqEYTYepfy9yK9IijcAFOBJOIC Gzhcv2l01GfNf7BuuuAWYCr+ZKTrgNABNFBC0EgbFTWCFpy/WY4V12R8650Glgy9 tC3Ea2c/gKO9oqM46HXKBdiMwQGUWCby9lK7GPP2iz8NDPVkPvy64eoz1U660xzj Q2MIReSRnbCcYprq4BY7 =ACvE -----END PGP SIGNATURE----- Merge tag 'nfc-next-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next Samuel Ortiz <sameo@linux.intel.com> says: This is the first NFC pull request for 3.10. The 2 features we have with this one are: - An LLCP Service Name Lookup (SNL) netlink interface for querying LLCP service availability from user space. Along the way, Thierry also improved the existing SNL interface for aggregating SNL responses. - An initial LLCP socket options implementation, for setting the Receive Window (RW) and the Maximum Information Unit Extension (MIUX) per socket. This is need for the LLCP validation tests. We also have a microread MEI build failure here: I am not sending this one to 3.9 because the MEI bus code is not there yet, so it won't break for anyone else than me. Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville
commit
720d3f1609
|
|
@ -48,7 +48,7 @@ struct mei_nfc_hdr {
|
|||
#define MEI_NFC_MAX_READ (MEI_NFC_HEADER_SIZE + MEI_NFC_MAX_HCI_PAYLOAD)
|
||||
|
||||
struct microread_mei_phy {
|
||||
struct mei_device *mei_device;
|
||||
struct mei_device *device;
|
||||
struct nfc_hci_dev *hdev;
|
||||
|
||||
int powered;
|
||||
|
|
|
|||
|
|
@ -298,6 +298,7 @@ struct ucred {
|
|||
#define SOL_IUCV 277
|
||||
#define SOL_CAIF 278
|
||||
#define SOL_ALG 279
|
||||
#define SOL_NFC 280
|
||||
|
||||
/* IPX options */
|
||||
#define IPX_TYPE 1
|
||||
|
|
|
|||
|
|
@ -90,6 +90,8 @@ enum nfc_commands {
|
|||
NFC_CMD_LLC_SET_PARAMS,
|
||||
NFC_CMD_ENABLE_SE,
|
||||
NFC_CMD_DISABLE_SE,
|
||||
NFC_CMD_LLC_SDREQ,
|
||||
NFC_EVENT_LLC_SDRES,
|
||||
/* private: internal use only */
|
||||
__NFC_CMD_AFTER_LAST
|
||||
};
|
||||
|
|
@ -140,11 +142,21 @@ enum nfc_attrs {
|
|||
NFC_ATTR_LLC_PARAM_RW,
|
||||
NFC_ATTR_LLC_PARAM_MIUX,
|
||||
NFC_ATTR_SE,
|
||||
NFC_ATTR_LLC_SDP,
|
||||
/* private: internal use only */
|
||||
__NFC_ATTR_AFTER_LAST
|
||||
};
|
||||
#define NFC_ATTR_MAX (__NFC_ATTR_AFTER_LAST - 1)
|
||||
|
||||
enum nfc_sdp_attr {
|
||||
NFC_SDP_ATTR_UNSPEC,
|
||||
NFC_SDP_ATTR_URI,
|
||||
NFC_SDP_ATTR_SAP,
|
||||
/* private: internal use only */
|
||||
__NFC_SDP_ATTR_AFTER_LAST
|
||||
};
|
||||
#define NFC_SDP_ATTR_MAX (__NFC_SDP_ATTR_AFTER_LAST - 1)
|
||||
|
||||
#define NFC_DEVICE_NAME_MAXSIZE 8
|
||||
#define NFC_NFCID1_MAXSIZE 10
|
||||
#define NFC_SENSB_RES_MAXSIZE 12
|
||||
|
|
@ -220,4 +232,8 @@ struct sockaddr_nfc_llcp {
|
|||
#define NFC_LLCP_DIRECTION_RX 0x00
|
||||
#define NFC_LLCP_DIRECTION_TX 0x01
|
||||
|
||||
/* socket option names */
|
||||
#define NFC_LLCP_RW 0
|
||||
#define NFC_LLCP_MIUX 1
|
||||
|
||||
#endif /*__LINUX_NFC_H */
|
||||
|
|
|
|||
|
|
@ -117,6 +117,88 @@ u8 *nfc_llcp_build_tlv(u8 type, u8 *value, u8 value_length, u8 *tlv_length)
|
|||
return tlv;
|
||||
}
|
||||
|
||||
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv(u8 tid, u8 sap)
|
||||
{
|
||||
struct nfc_llcp_sdp_tlv *sdres;
|
||||
u8 value[2];
|
||||
|
||||
sdres = kzalloc(sizeof(struct nfc_llcp_sdp_tlv), GFP_KERNEL);
|
||||
if (sdres == NULL)
|
||||
return NULL;
|
||||
|
||||
value[0] = tid;
|
||||
value[1] = sap;
|
||||
|
||||
sdres->tlv = nfc_llcp_build_tlv(LLCP_TLV_SDRES, value, 2,
|
||||
&sdres->tlv_len);
|
||||
if (sdres->tlv == NULL) {
|
||||
kfree(sdres);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sdres->tid = tid;
|
||||
sdres->sap = sap;
|
||||
|
||||
INIT_HLIST_NODE(&sdres->node);
|
||||
|
||||
return sdres;
|
||||
}
|
||||
|
||||
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, char *uri,
|
||||
size_t uri_len)
|
||||
{
|
||||
struct nfc_llcp_sdp_tlv *sdreq;
|
||||
|
||||
pr_debug("uri: %s, len: %zu\n", uri, uri_len);
|
||||
|
||||
sdreq = kzalloc(sizeof(struct nfc_llcp_sdp_tlv), GFP_KERNEL);
|
||||
if (sdreq == NULL)
|
||||
return NULL;
|
||||
|
||||
sdreq->tlv_len = uri_len + 3;
|
||||
|
||||
if (uri[uri_len - 1] == 0)
|
||||
sdreq->tlv_len--;
|
||||
|
||||
sdreq->tlv = kzalloc(sdreq->tlv_len + 1, GFP_KERNEL);
|
||||
if (sdreq->tlv == NULL) {
|
||||
kfree(sdreq);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sdreq->tlv[0] = LLCP_TLV_SDREQ;
|
||||
sdreq->tlv[1] = sdreq->tlv_len - 2;
|
||||
sdreq->tlv[2] = tid;
|
||||
|
||||
sdreq->tid = tid;
|
||||
sdreq->uri = sdreq->tlv + 3;
|
||||
memcpy(sdreq->uri, uri, uri_len);
|
||||
|
||||
sdreq->time = jiffies;
|
||||
|
||||
INIT_HLIST_NODE(&sdreq->node);
|
||||
|
||||
return sdreq;
|
||||
}
|
||||
|
||||
void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp)
|
||||
{
|
||||
kfree(sdp->tlv);
|
||||
kfree(sdp);
|
||||
}
|
||||
|
||||
void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head)
|
||||
{
|
||||
struct nfc_llcp_sdp_tlv *sdp;
|
||||
struct hlist_node *n;
|
||||
|
||||
hlist_for_each_entry_safe(sdp, n, head, node) {
|
||||
hlist_del(&sdp->node);
|
||||
|
||||
nfc_llcp_free_sdp_tlv(sdp);
|
||||
}
|
||||
}
|
||||
|
||||
int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local,
|
||||
u8 *tlv_array, u16 tlv_array_len)
|
||||
{
|
||||
|
|
@ -184,10 +266,10 @@ int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,
|
|||
|
||||
switch (type) {
|
||||
case LLCP_TLV_MIUX:
|
||||
sock->miu = llcp_tlv_miux(tlv) + 128;
|
||||
sock->remote_miu = llcp_tlv_miux(tlv) + 128;
|
||||
break;
|
||||
case LLCP_TLV_RW:
|
||||
sock->rw = llcp_tlv_rw(tlv);
|
||||
sock->remote_rw = llcp_tlv_rw(tlv);
|
||||
break;
|
||||
case LLCP_TLV_SN:
|
||||
break;
|
||||
|
|
@ -200,7 +282,8 @@ int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,
|
|||
tlv += length + 2;
|
||||
}
|
||||
|
||||
pr_debug("sock %p rw %d miu %d\n", sock, sock->rw, sock->miu);
|
||||
pr_debug("sock %p rw %d miu %d\n", sock,
|
||||
sock->remote_rw, sock->remote_miu);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -318,9 +401,9 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)
|
|||
struct sk_buff *skb;
|
||||
u8 *service_name_tlv = NULL, service_name_tlv_length;
|
||||
u8 *miux_tlv = NULL, miux_tlv_length;
|
||||
u8 *rw_tlv = NULL, rw_tlv_length;
|
||||
u8 *rw_tlv = NULL, rw_tlv_length, rw;
|
||||
int err;
|
||||
u16 size = 0;
|
||||
u16 size = 0, miux;
|
||||
|
||||
pr_debug("Sending CONNECT\n");
|
||||
|
||||
|
|
@ -336,11 +419,15 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)
|
|||
size += service_name_tlv_length;
|
||||
}
|
||||
|
||||
miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&local->miux, 0,
|
||||
/* If the socket parameters are not set, use the local ones */
|
||||
miux = sock->miux > LLCP_MAX_MIUX ? local->miux : sock->miux;
|
||||
rw = sock->rw > LLCP_MAX_RW ? local->rw : sock->rw;
|
||||
|
||||
miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&miux, 0,
|
||||
&miux_tlv_length);
|
||||
size += miux_tlv_length;
|
||||
|
||||
rw_tlv = nfc_llcp_build_tlv(LLCP_TLV_RW, &local->rw, 0, &rw_tlv_length);
|
||||
rw_tlv = nfc_llcp_build_tlv(LLCP_TLV_RW, &rw, 0, &rw_tlv_length);
|
||||
size += rw_tlv_length;
|
||||
|
||||
pr_debug("SKB size %d SN length %zu\n", size, sock->service_name_len);
|
||||
|
|
@ -377,9 +464,9 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock)
|
|||
struct nfc_llcp_local *local;
|
||||
struct sk_buff *skb;
|
||||
u8 *miux_tlv = NULL, miux_tlv_length;
|
||||
u8 *rw_tlv = NULL, rw_tlv_length;
|
||||
u8 *rw_tlv = NULL, rw_tlv_length, rw;
|
||||
int err;
|
||||
u16 size = 0;
|
||||
u16 size = 0, miux;
|
||||
|
||||
pr_debug("Sending CC\n");
|
||||
|
||||
|
|
@ -387,11 +474,15 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock)
|
|||
if (local == NULL)
|
||||
return -ENODEV;
|
||||
|
||||
miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&local->miux, 0,
|
||||
/* If the socket parameters are not set, use the local ones */
|
||||
miux = sock->miux > LLCP_MAX_MIUX ? local->miux : sock->miux;
|
||||
rw = sock->rw > LLCP_MAX_RW ? local->rw : sock->rw;
|
||||
|
||||
miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&miux, 0,
|
||||
&miux_tlv_length);
|
||||
size += miux_tlv_length;
|
||||
|
||||
rw_tlv = nfc_llcp_build_tlv(LLCP_TLV_RW, &local->rw, 0, &rw_tlv_length);
|
||||
rw_tlv = nfc_llcp_build_tlv(LLCP_TLV_RW, &rw, 0, &rw_tlv_length);
|
||||
size += rw_tlv_length;
|
||||
|
||||
skb = llcp_allocate_pdu(sock, LLCP_PDU_CC, size);
|
||||
|
|
@ -416,48 +507,90 @@ error_tlv:
|
|||
return err;
|
||||
}
|
||||
|
||||
int nfc_llcp_send_snl(struct nfc_llcp_local *local, u8 tid, u8 sap)
|
||||
static struct sk_buff *nfc_llcp_allocate_snl(struct nfc_llcp_local *local,
|
||||
size_t tlv_length)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
struct nfc_dev *dev;
|
||||
u8 *sdres_tlv = NULL, sdres_tlv_length, sdres[2];
|
||||
u16 size = 0;
|
||||
|
||||
pr_debug("Sending SNL tid 0x%x sap 0x%x\n", tid, sap);
|
||||
|
||||
if (local == NULL)
|
||||
return -ENODEV;
|
||||
return ERR_PTR(-ENODEV);
|
||||
|
||||
dev = local->dev;
|
||||
if (dev == NULL)
|
||||
return -ENODEV;
|
||||
|
||||
sdres[0] = tid;
|
||||
sdres[1] = sap;
|
||||
sdres_tlv = nfc_llcp_build_tlv(LLCP_TLV_SDRES, sdres, 0,
|
||||
&sdres_tlv_length);
|
||||
if (sdres_tlv == NULL)
|
||||
return -ENOMEM;
|
||||
return ERR_PTR(-ENODEV);
|
||||
|
||||
size += LLCP_HEADER_SIZE;
|
||||
size += dev->tx_headroom + dev->tx_tailroom + NFC_HEADER_SIZE;
|
||||
size += sdres_tlv_length;
|
||||
size += tlv_length;
|
||||
|
||||
skb = alloc_skb(size, GFP_KERNEL);
|
||||
if (skb == NULL) {
|
||||
kfree(sdres_tlv);
|
||||
return -ENOMEM;
|
||||
}
|
||||
if (skb == NULL)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
skb_reserve(skb, dev->tx_headroom + NFC_HEADER_SIZE);
|
||||
|
||||
skb = llcp_add_header(skb, LLCP_SAP_SDP, LLCP_SAP_SDP, LLCP_PDU_SNL);
|
||||
|
||||
memcpy(skb_put(skb, sdres_tlv_length), sdres_tlv, sdres_tlv_length);
|
||||
return skb;
|
||||
}
|
||||
|
||||
int nfc_llcp_send_snl_sdres(struct nfc_llcp_local *local,
|
||||
struct hlist_head *tlv_list, size_t tlvs_len)
|
||||
{
|
||||
struct nfc_llcp_sdp_tlv *sdp;
|
||||
struct hlist_node *n;
|
||||
struct sk_buff *skb;
|
||||
|
||||
skb = nfc_llcp_allocate_snl(local, tlvs_len);
|
||||
if (IS_ERR(skb))
|
||||
return PTR_ERR(skb);
|
||||
|
||||
hlist_for_each_entry_safe(sdp, n, tlv_list, node) {
|
||||
memcpy(skb_put(skb, sdp->tlv_len), sdp->tlv, sdp->tlv_len);
|
||||
|
||||
hlist_del(&sdp->node);
|
||||
|
||||
nfc_llcp_free_sdp_tlv(sdp);
|
||||
}
|
||||
|
||||
skb_queue_tail(&local->tx_queue, skb);
|
||||
|
||||
kfree(sdres_tlv);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int nfc_llcp_send_snl_sdreq(struct nfc_llcp_local *local,
|
||||
struct hlist_head *tlv_list, size_t tlvs_len)
|
||||
{
|
||||
struct nfc_llcp_sdp_tlv *sdreq;
|
||||
struct hlist_node *n;
|
||||
struct sk_buff *skb;
|
||||
|
||||
skb = nfc_llcp_allocate_snl(local, tlvs_len);
|
||||
if (IS_ERR(skb))
|
||||
return PTR_ERR(skb);
|
||||
|
||||
mutex_lock(&local->sdreq_lock);
|
||||
|
||||
if (hlist_empty(&local->pending_sdreqs))
|
||||
mod_timer(&local->sdreq_timer,
|
||||
jiffies + msecs_to_jiffies(3 * local->remote_lto));
|
||||
|
||||
hlist_for_each_entry_safe(sdreq, n, tlv_list, node) {
|
||||
pr_debug("tid %d for %s\n", sdreq->tid, sdreq->uri);
|
||||
|
||||
memcpy(skb_put(skb, sdreq->tlv_len), sdreq->tlv,
|
||||
sdreq->tlv_len);
|
||||
|
||||
hlist_del(&sdreq->node);
|
||||
|
||||
hlist_add_head(&sdreq->node, &local->pending_sdreqs);
|
||||
}
|
||||
|
||||
mutex_unlock(&local->sdreq_lock);
|
||||
|
||||
skb_queue_tail(&local->tx_queue, skb);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -532,8 +665,8 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
|
|||
|
||||
/* Remote is ready but has not acknowledged our frames */
|
||||
if((sock->remote_ready &&
|
||||
skb_queue_len(&sock->tx_pending_queue) >= sock->rw &&
|
||||
skb_queue_len(&sock->tx_queue) >= 2 * sock->rw)) {
|
||||
skb_queue_len(&sock->tx_pending_queue) >= sock->remote_rw &&
|
||||
skb_queue_len(&sock->tx_queue) >= 2 * sock->remote_rw)) {
|
||||
pr_err("Pending queue is full %d frames\n",
|
||||
skb_queue_len(&sock->tx_pending_queue));
|
||||
return -ENOBUFS;
|
||||
|
|
@ -541,7 +674,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
|
|||
|
||||
/* Remote is not ready and we've been queueing enough frames */
|
||||
if ((!sock->remote_ready &&
|
||||
skb_queue_len(&sock->tx_queue) >= 2 * sock->rw)) {
|
||||
skb_queue_len(&sock->tx_queue) >= 2 * sock->remote_rw)) {
|
||||
pr_err("Tx queue is full %d frames\n",
|
||||
skb_queue_len(&sock->tx_queue));
|
||||
return -ENOBUFS;
|
||||
|
|
@ -561,7 +694,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
|
|||
|
||||
while (remaining_len > 0) {
|
||||
|
||||
frag_len = min_t(size_t, sock->miu, remaining_len);
|
||||
frag_len = min_t(size_t, sock->remote_miu, remaining_len);
|
||||
|
||||
pr_debug("Fragment %zd bytes remaining %zd",
|
||||
frag_len, remaining_len);
|
||||
|
|
@ -621,7 +754,7 @@ int nfc_llcp_send_ui_frame(struct nfc_llcp_sock *sock, u8 ssap, u8 dsap,
|
|||
|
||||
while (remaining_len > 0) {
|
||||
|
||||
frag_len = min_t(size_t, sock->miu, remaining_len);
|
||||
frag_len = min_t(size_t, sock->remote_miu, remaining_len);
|
||||
|
||||
pr_debug("Fragment %zd bytes remaining %zd",
|
||||
frag_len, remaining_len);
|
||||
|
|
|
|||
|
|
@ -156,6 +156,9 @@ static void local_release(struct kref *ref)
|
|||
cancel_work_sync(&local->rx_work);
|
||||
cancel_work_sync(&local->timeout_work);
|
||||
kfree_skb(local->rx_pending);
|
||||
del_timer_sync(&local->sdreq_timer);
|
||||
cancel_work_sync(&local->sdreq_timeout_work);
|
||||
nfc_llcp_free_sdp_tlv_list(&local->pending_sdreqs);
|
||||
kfree(local);
|
||||
}
|
||||
|
||||
|
|
@ -223,6 +226,47 @@ static void nfc_llcp_symm_timer(unsigned long data)
|
|||
schedule_work(&local->timeout_work);
|
||||
}
|
||||
|
||||
static void nfc_llcp_sdreq_timeout_work(struct work_struct *work)
|
||||
{
|
||||
unsigned long time;
|
||||
HLIST_HEAD(nl_sdres_list);
|
||||
struct hlist_node *n;
|
||||
struct nfc_llcp_sdp_tlv *sdp;
|
||||
struct nfc_llcp_local *local = container_of(work, struct nfc_llcp_local,
|
||||
sdreq_timeout_work);
|
||||
|
||||
mutex_lock(&local->sdreq_lock);
|
||||
|
||||
time = jiffies - msecs_to_jiffies(3 * local->remote_lto);
|
||||
|
||||
hlist_for_each_entry_safe(sdp, n, &local->pending_sdreqs, node) {
|
||||
if (time_after(sdp->time, time))
|
||||
continue;
|
||||
|
||||
sdp->sap = LLCP_SDP_UNBOUND;
|
||||
|
||||
hlist_del(&sdp->node);
|
||||
|
||||
hlist_add_head(&sdp->node, &nl_sdres_list);
|
||||
}
|
||||
|
||||
if (!hlist_empty(&local->pending_sdreqs))
|
||||
mod_timer(&local->sdreq_timer,
|
||||
jiffies + msecs_to_jiffies(3 * local->remote_lto));
|
||||
|
||||
mutex_unlock(&local->sdreq_lock);
|
||||
|
||||
if (!hlist_empty(&nl_sdres_list))
|
||||
nfc_genl_llc_send_sdres(local->dev, &nl_sdres_list);
|
||||
}
|
||||
|
||||
static void nfc_llcp_sdreq_timer(unsigned long data)
|
||||
{
|
||||
struct nfc_llcp_local *local = (struct nfc_llcp_local *) data;
|
||||
|
||||
schedule_work(&local->sdreq_timeout_work);
|
||||
}
|
||||
|
||||
struct nfc_llcp_local *nfc_llcp_find_local(struct nfc_dev *dev)
|
||||
{
|
||||
struct nfc_llcp_local *local, *n;
|
||||
|
|
@ -766,8 +810,6 @@ static void nfc_llcp_recv_ui(struct nfc_llcp_local *local,
|
|||
ui_cb->dsap = dsap;
|
||||
ui_cb->ssap = ssap;
|
||||
|
||||
printk("%s %d %d\n", __func__, dsap, ssap);
|
||||
|
||||
pr_debug("%d %d\n", dsap, ssap);
|
||||
|
||||
/* We're looking for a bound socket, not a client one */
|
||||
|
|
@ -865,7 +907,9 @@ 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->miu = local->remote_miu;
|
||||
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;
|
||||
new_sock->target_idx = local->target_idx;
|
||||
|
|
@ -919,11 +963,11 @@ int nfc_llcp_queue_i_frames(struct nfc_llcp_sock *sock)
|
|||
|
||||
pr_debug("Remote ready %d tx queue len %d remote rw %d",
|
||||
sock->remote_ready, skb_queue_len(&sock->tx_pending_queue),
|
||||
sock->rw);
|
||||
sock->remote_rw);
|
||||
|
||||
/* Try to queue some I frames for transmission */
|
||||
while (sock->remote_ready &&
|
||||
skb_queue_len(&sock->tx_pending_queue) < sock->rw) {
|
||||
skb_queue_len(&sock->tx_pending_queue) < sock->remote_rw) {
|
||||
struct sk_buff *pdu;
|
||||
|
||||
pdu = skb_dequeue(&sock->tx_queue);
|
||||
|
|
@ -1144,6 +1188,10 @@ static void nfc_llcp_recv_snl(struct nfc_llcp_local *local,
|
|||
u16 tlv_len, offset;
|
||||
char *service_name;
|
||||
size_t service_name_len;
|
||||
struct nfc_llcp_sdp_tlv *sdp;
|
||||
HLIST_HEAD(llc_sdres_list);
|
||||
size_t sdres_tlvs_len;
|
||||
HLIST_HEAD(nl_sdres_list);
|
||||
|
||||
dsap = nfc_llcp_dsap(skb);
|
||||
ssap = nfc_llcp_ssap(skb);
|
||||
|
|
@ -1158,6 +1206,7 @@ static void nfc_llcp_recv_snl(struct nfc_llcp_local *local,
|
|||
tlv = &skb->data[LLCP_HEADER_SIZE];
|
||||
tlv_len = skb->len - LLCP_HEADER_SIZE;
|
||||
offset = 0;
|
||||
sdres_tlvs_len = 0;
|
||||
|
||||
while (offset < tlv_len) {
|
||||
type = tlv[0];
|
||||
|
|
@ -1175,14 +1224,14 @@ static void nfc_llcp_recv_snl(struct nfc_llcp_local *local,
|
|||
!strncmp(service_name, "urn:nfc:sn:sdp",
|
||||
service_name_len)) {
|
||||
sap = 1;
|
||||
goto send_snl;
|
||||
goto add_snl;
|
||||
}
|
||||
|
||||
llcp_sock = nfc_llcp_sock_from_sn(local, service_name,
|
||||
service_name_len);
|
||||
if (!llcp_sock) {
|
||||
sap = 0;
|
||||
goto send_snl;
|
||||
goto add_snl;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1199,7 +1248,7 @@ static void nfc_llcp_recv_snl(struct nfc_llcp_local *local,
|
|||
|
||||
if (sap == LLCP_SAP_MAX) {
|
||||
sap = 0;
|
||||
goto send_snl;
|
||||
goto add_snl;
|
||||
}
|
||||
|
||||
client_count =
|
||||
|
|
@ -1216,8 +1265,37 @@ static void nfc_llcp_recv_snl(struct nfc_llcp_local *local,
|
|||
|
||||
pr_debug("%p %d\n", llcp_sock, sap);
|
||||
|
||||
send_snl:
|
||||
nfc_llcp_send_snl(local, tid, sap);
|
||||
add_snl:
|
||||
sdp = nfc_llcp_build_sdres_tlv(tid, sap);
|
||||
if (sdp == NULL)
|
||||
goto exit;
|
||||
|
||||
sdres_tlvs_len += sdp->tlv_len;
|
||||
hlist_add_head(&sdp->node, &llc_sdres_list);
|
||||
break;
|
||||
|
||||
case LLCP_TLV_SDRES:
|
||||
mutex_lock(&local->sdreq_lock);
|
||||
|
||||
pr_debug("LLCP_TLV_SDRES: searching tid %d\n", tlv[2]);
|
||||
|
||||
hlist_for_each_entry(sdp, &local->pending_sdreqs, node) {
|
||||
if (sdp->tid != tlv[2])
|
||||
continue;
|
||||
|
||||
sdp->sap = tlv[3];
|
||||
|
||||
pr_debug("Found: uri=%s, sap=%d\n",
|
||||
sdp->uri, sdp->sap);
|
||||
|
||||
hlist_del(&sdp->node);
|
||||
|
||||
hlist_add_head(&sdp->node, &nl_sdres_list);
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
mutex_unlock(&local->sdreq_lock);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -1228,6 +1306,13 @@ send_snl:
|
|||
offset += length + 2;
|
||||
tlv += length + 2;
|
||||
}
|
||||
|
||||
exit:
|
||||
if (!hlist_empty(&nl_sdres_list))
|
||||
nfc_genl_llc_send_sdres(local->dev, &nl_sdres_list);
|
||||
|
||||
if (!hlist_empty(&llc_sdres_list))
|
||||
nfc_llcp_send_snl_sdres(local, &llc_sdres_list, sdres_tlvs_len);
|
||||
}
|
||||
|
||||
static void nfc_llcp_rx_work(struct work_struct *work)
|
||||
|
|
@ -1413,6 +1498,13 @@ int nfc_llcp_register_device(struct nfc_dev *ndev)
|
|||
local->remote_miu = LLCP_DEFAULT_MIU;
|
||||
local->remote_lto = LLCP_DEFAULT_LTO;
|
||||
|
||||
mutex_init(&local->sdreq_lock);
|
||||
INIT_HLIST_HEAD(&local->pending_sdreqs);
|
||||
init_timer(&local->sdreq_timer);
|
||||
local->sdreq_timer.data = (unsigned long) local;
|
||||
local->sdreq_timer.function = nfc_llcp_sdreq_timer;
|
||||
INIT_WORK(&local->sdreq_timeout_work, nfc_llcp_sdreq_timeout_work);
|
||||
|
||||
list_add(&local->list, &llcp_devices);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -46,6 +46,19 @@ struct llcp_sock_list {
|
|||
rwlock_t lock;
|
||||
};
|
||||
|
||||
struct nfc_llcp_sdp_tlv {
|
||||
u8 *tlv;
|
||||
u8 tlv_len;
|
||||
|
||||
char *uri;
|
||||
u8 tid;
|
||||
u8 sap;
|
||||
|
||||
unsigned long time;
|
||||
|
||||
struct hlist_node node;
|
||||
};
|
||||
|
||||
struct nfc_llcp_local {
|
||||
struct list_head list;
|
||||
struct nfc_dev *dev;
|
||||
|
|
@ -86,6 +99,12 @@ struct nfc_llcp_local {
|
|||
u8 remote_opt;
|
||||
u16 remote_wks;
|
||||
|
||||
struct mutex sdreq_lock;
|
||||
struct hlist_head pending_sdreqs;
|
||||
struct timer_list sdreq_timer;
|
||||
struct work_struct sdreq_timeout_work;
|
||||
u8 sdreq_next_tid;
|
||||
|
||||
/* sockets array */
|
||||
struct llcp_sock_list sockets;
|
||||
struct llcp_sock_list connecting_sockets;
|
||||
|
|
@ -105,7 +124,12 @@ struct nfc_llcp_sock {
|
|||
char *service_name;
|
||||
size_t service_name_len;
|
||||
u8 rw;
|
||||
u16 miu;
|
||||
u16 miux;
|
||||
|
||||
|
||||
/* Remote link parameters */
|
||||
u8 remote_rw;
|
||||
u16 remote_miu;
|
||||
|
||||
/* Link variables */
|
||||
u8 send_n;
|
||||
|
|
@ -213,12 +237,20 @@ int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,
|
|||
/* Commands API */
|
||||
void nfc_llcp_recv(void *data, struct sk_buff *skb, int err);
|
||||
u8 *nfc_llcp_build_tlv(u8 type, u8 *value, u8 value_length, u8 *tlv_length);
|
||||
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv(u8 tid, u8 sap);
|
||||
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, char *uri,
|
||||
size_t uri_len);
|
||||
void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp);
|
||||
void nfc_llcp_free_sdp_tlv_list(struct hlist_head *sdp_head);
|
||||
void nfc_llcp_recv(void *data, struct sk_buff *skb, int err);
|
||||
int nfc_llcp_disconnect(struct nfc_llcp_sock *sock);
|
||||
int nfc_llcp_send_symm(struct nfc_dev *dev);
|
||||
int nfc_llcp_send_connect(struct nfc_llcp_sock *sock);
|
||||
int nfc_llcp_send_cc(struct nfc_llcp_sock *sock);
|
||||
int nfc_llcp_send_snl(struct nfc_llcp_local *local, u8 tid, u8 sap);
|
||||
int nfc_llcp_send_snl_sdres(struct nfc_llcp_local *local,
|
||||
struct hlist_head *tlv_list, size_t tlvs_len);
|
||||
int nfc_llcp_send_snl_sdreq(struct nfc_llcp_local *local,
|
||||
struct hlist_head *tlv_list, size_t tlvs_len);
|
||||
int nfc_llcp_send_dm(struct nfc_llcp_local *local, u8 ssap, u8 dsap, u8 reason);
|
||||
int nfc_llcp_send_disconnect(struct nfc_llcp_sock *sock);
|
||||
int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
|
||||
|
|
|
|||
|
|
@ -223,6 +223,124 @@ error:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int nfc_llcp_setsockopt(struct socket *sock, int level, int optname,
|
||||
char __user *optval, unsigned int optlen)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
|
||||
u32 opt;
|
||||
int err = 0;
|
||||
|
||||
pr_debug("%p optname %d\n", sk, optname);
|
||||
|
||||
if (level != SOL_NFC)
|
||||
return -ENOPROTOOPT;
|
||||
|
||||
lock_sock(sk);
|
||||
|
||||
switch (optname) {
|
||||
case NFC_LLCP_RW:
|
||||
if (sk->sk_state == LLCP_CONNECTED ||
|
||||
sk->sk_state == LLCP_BOUND ||
|
||||
sk->sk_state == LLCP_LISTEN) {
|
||||
err = -EINVAL;
|
||||
break;
|
||||
}
|
||||
|
||||
if (get_user(opt, (u32 __user *) optval)) {
|
||||
err = -EFAULT;
|
||||
break;
|
||||
}
|
||||
|
||||
if (opt > LLCP_MAX_RW) {
|
||||
err = -EINVAL;
|
||||
break;
|
||||
}
|
||||
|
||||
llcp_sock->rw = (u8) opt;
|
||||
|
||||
break;
|
||||
|
||||
case NFC_LLCP_MIUX:
|
||||
if (sk->sk_state == LLCP_CONNECTED ||
|
||||
sk->sk_state == LLCP_BOUND ||
|
||||
sk->sk_state == LLCP_LISTEN) {
|
||||
err = -EINVAL;
|
||||
break;
|
||||
}
|
||||
|
||||
if (get_user(opt, (u32 __user *) optval)) {
|
||||
err = -EFAULT;
|
||||
break;
|
||||
}
|
||||
|
||||
if (opt > LLCP_MAX_MIUX) {
|
||||
err = -EINVAL;
|
||||
break;
|
||||
}
|
||||
|
||||
llcp_sock->miux = (u16) opt;
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
err = -ENOPROTOOPT;
|
||||
break;
|
||||
}
|
||||
|
||||
release_sock(sk);
|
||||
|
||||
pr_debug("%p rw %d miux %d\n", llcp_sock,
|
||||
llcp_sock->rw, llcp_sock->miux);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int nfc_llcp_getsockopt(struct socket *sock, int level, int optname,
|
||||
char __user *optval, int __user *optlen)
|
||||
{
|
||||
struct sock *sk = sock->sk;
|
||||
struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
|
||||
int len, err = 0;
|
||||
|
||||
pr_debug("%p optname %d\n", sk, optname);
|
||||
|
||||
if (level != SOL_NFC)
|
||||
return -ENOPROTOOPT;
|
||||
|
||||
if (get_user(len, optlen))
|
||||
return -EFAULT;
|
||||
|
||||
len = min_t(u32, len, sizeof(u32));
|
||||
|
||||
lock_sock(sk);
|
||||
|
||||
switch (optname) {
|
||||
case NFC_LLCP_RW:
|
||||
if (put_user(llcp_sock->rw, (u32 __user *) optval))
|
||||
err = -EFAULT;
|
||||
|
||||
break;
|
||||
|
||||
case NFC_LLCP_MIUX:
|
||||
if (put_user(llcp_sock->miux, (u32 __user *) optval))
|
||||
err = -EFAULT;
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
err = -ENOPROTOOPT;
|
||||
break;
|
||||
}
|
||||
|
||||
release_sock(sk);
|
||||
|
||||
if (put_user(len, optlen))
|
||||
return -EFAULT;
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
void nfc_llcp_accept_unlink(struct sock *sk)
|
||||
{
|
||||
struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
|
||||
|
|
@ -541,7 +659,7 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,
|
|||
|
||||
llcp_sock->dev = dev;
|
||||
llcp_sock->local = nfc_llcp_local_get(local);
|
||||
llcp_sock->miu = llcp_sock->local->remote_miu;
|
||||
llcp_sock->remote_miu = llcp_sock->local->remote_miu;
|
||||
llcp_sock->ssap = nfc_llcp_get_local_ssap(local);
|
||||
if (llcp_sock->ssap == LLCP_SAP_MAX) {
|
||||
ret = -ENOMEM;
|
||||
|
|
@ -735,8 +853,8 @@ static const struct proto_ops llcp_sock_ops = {
|
|||
.ioctl = sock_no_ioctl,
|
||||
.listen = llcp_sock_listen,
|
||||
.shutdown = sock_no_shutdown,
|
||||
.setsockopt = sock_no_setsockopt,
|
||||
.getsockopt = sock_no_getsockopt,
|
||||
.setsockopt = nfc_llcp_setsockopt,
|
||||
.getsockopt = nfc_llcp_getsockopt,
|
||||
.sendmsg = llcp_sock_sendmsg,
|
||||
.recvmsg = llcp_sock_recvmsg,
|
||||
.mmap = sock_no_mmap,
|
||||
|
|
@ -800,8 +918,10 @@ struct sock *nfc_llcp_sock_alloc(struct socket *sock, int type, gfp_t gfp)
|
|||
|
||||
llcp_sock->ssap = 0;
|
||||
llcp_sock->dsap = LLCP_SAP_SDP;
|
||||
llcp_sock->rw = LLCP_DEFAULT_RW;
|
||||
llcp_sock->miu = LLCP_DEFAULT_MIU;
|
||||
llcp_sock->rw = LLCP_MAX_RW + 1;
|
||||
llcp_sock->miux = LLCP_MAX_MIUX + 1;
|
||||
llcp_sock->remote_rw = LLCP_DEFAULT_RW;
|
||||
llcp_sock->remote_miu = LLCP_DEFAULT_MIU;
|
||||
llcp_sock->send_n = llcp_sock->send_ack_n = 0;
|
||||
llcp_sock->recv_n = llcp_sock->recv_ack_n = 0;
|
||||
llcp_sock->remote_ready = 1;
|
||||
|
|
|
|||
|
|
@ -53,6 +53,15 @@ static const struct nla_policy nfc_genl_policy[NFC_ATTR_MAX + 1] = {
|
|||
[NFC_ATTR_DEVICE_POWERED] = { .type = NLA_U8 },
|
||||
[NFC_ATTR_IM_PROTOCOLS] = { .type = NLA_U32 },
|
||||
[NFC_ATTR_TM_PROTOCOLS] = { .type = NLA_U32 },
|
||||
[NFC_ATTR_LLC_PARAM_LTO] = { .type = NLA_U8 },
|
||||
[NFC_ATTR_LLC_PARAM_RW] = { .type = NLA_U8 },
|
||||
[NFC_ATTR_LLC_PARAM_MIUX] = { .type = NLA_U16 },
|
||||
[NFC_ATTR_LLC_SDP] = { .type = NLA_NESTED },
|
||||
};
|
||||
|
||||
static const struct nla_policy nfc_sdp_genl_policy[NFC_SDP_ATTR_MAX + 1] = {
|
||||
[NFC_SDP_ATTR_URI] = { .type = NLA_STRING },
|
||||
[NFC_SDP_ATTR_SAP] = { .type = NLA_U8 },
|
||||
};
|
||||
|
||||
static int nfc_genl_send_target(struct sk_buff *msg, struct nfc_target *target,
|
||||
|
|
@ -348,6 +357,74 @@ free_msg:
|
|||
return -EMSGSIZE;
|
||||
}
|
||||
|
||||
int nfc_genl_llc_send_sdres(struct nfc_dev *dev, struct hlist_head *sdres_list)
|
||||
{
|
||||
struct sk_buff *msg;
|
||||
struct nlattr *sdp_attr, *uri_attr;
|
||||
struct nfc_llcp_sdp_tlv *sdres;
|
||||
struct hlist_node *n;
|
||||
void *hdr;
|
||||
int rc = -EMSGSIZE;
|
||||
int i;
|
||||
|
||||
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
||||
if (!msg)
|
||||
return -ENOMEM;
|
||||
|
||||
hdr = genlmsg_put(msg, 0, 0, &nfc_genl_family, 0,
|
||||
NFC_EVENT_LLC_SDRES);
|
||||
if (!hdr)
|
||||
goto free_msg;
|
||||
|
||||
if (nla_put_u32(msg, NFC_ATTR_DEVICE_INDEX, dev->idx))
|
||||
goto nla_put_failure;
|
||||
|
||||
sdp_attr = nla_nest_start(msg, NFC_ATTR_LLC_SDP);
|
||||
if (sdp_attr == NULL) {
|
||||
rc = -ENOMEM;
|
||||
goto nla_put_failure;
|
||||
}
|
||||
|
||||
i = 1;
|
||||
hlist_for_each_entry_safe(sdres, n, sdres_list, node) {
|
||||
pr_debug("uri: %s, sap: %d\n", sdres->uri, sdres->sap);
|
||||
|
||||
uri_attr = nla_nest_start(msg, i++);
|
||||
if (uri_attr == NULL) {
|
||||
rc = -ENOMEM;
|
||||
goto nla_put_failure;
|
||||
}
|
||||
|
||||
if (nla_put_u8(msg, NFC_SDP_ATTR_SAP, sdres->sap))
|
||||
goto nla_put_failure;
|
||||
|
||||
if (nla_put_string(msg, NFC_SDP_ATTR_URI, sdres->uri))
|
||||
goto nla_put_failure;
|
||||
|
||||
nla_nest_end(msg, uri_attr);
|
||||
|
||||
hlist_del(&sdres->node);
|
||||
|
||||
nfc_llcp_free_sdp_tlv(sdres);
|
||||
}
|
||||
|
||||
nla_nest_end(msg, sdp_attr);
|
||||
|
||||
genlmsg_end(msg, hdr);
|
||||
|
||||
return genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_ATOMIC);
|
||||
|
||||
nla_put_failure:
|
||||
genlmsg_cancel(msg, hdr);
|
||||
|
||||
free_msg:
|
||||
nlmsg_free(msg);
|
||||
|
||||
nfc_llcp_free_sdp_tlv_list(sdres_list);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int nfc_genl_send_device(struct sk_buff *msg, struct nfc_dev *dev,
|
||||
u32 portid, u32 seq,
|
||||
struct netlink_callback *cb,
|
||||
|
|
@ -859,6 +936,96 @@ exit:
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int nfc_genl_llc_sdreq(struct sk_buff *skb, struct genl_info *info)
|
||||
{
|
||||
struct nfc_dev *dev;
|
||||
struct nfc_llcp_local *local;
|
||||
struct nlattr *attr, *sdp_attrs[NFC_SDP_ATTR_MAX+1];
|
||||
u32 idx;
|
||||
u8 tid;
|
||||
char *uri;
|
||||
int rc = 0, rem;
|
||||
size_t uri_len, tlvs_len;
|
||||
struct hlist_head sdreq_list;
|
||||
struct nfc_llcp_sdp_tlv *sdreq;
|
||||
|
||||
if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||
|
||||
!info->attrs[NFC_ATTR_LLC_SDP])
|
||||
return -EINVAL;
|
||||
|
||||
idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
|
||||
|
||||
dev = nfc_get_device(idx);
|
||||
if (!dev) {
|
||||
rc = -ENODEV;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
device_lock(&dev->dev);
|
||||
|
||||
if (dev->dep_link_up == false) {
|
||||
rc = -ENOLINK;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
local = nfc_llcp_find_local(dev);
|
||||
if (!local) {
|
||||
nfc_put_device(dev);
|
||||
rc = -ENODEV;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
INIT_HLIST_HEAD(&sdreq_list);
|
||||
|
||||
tlvs_len = 0;
|
||||
|
||||
nla_for_each_nested(attr, info->attrs[NFC_ATTR_LLC_SDP], rem) {
|
||||
rc = nla_parse_nested(sdp_attrs, NFC_SDP_ATTR_MAX, attr,
|
||||
nfc_sdp_genl_policy);
|
||||
|
||||
if (rc != 0) {
|
||||
rc = -EINVAL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
if (!sdp_attrs[NFC_SDP_ATTR_URI])
|
||||
continue;
|
||||
|
||||
uri_len = nla_len(sdp_attrs[NFC_SDP_ATTR_URI]);
|
||||
if (uri_len == 0)
|
||||
continue;
|
||||
|
||||
uri = nla_data(sdp_attrs[NFC_SDP_ATTR_URI]);
|
||||
if (uri == NULL || *uri == 0)
|
||||
continue;
|
||||
|
||||
tid = local->sdreq_next_tid++;
|
||||
|
||||
sdreq = nfc_llcp_build_sdreq_tlv(tid, uri, uri_len);
|
||||
if (sdreq == NULL) {
|
||||
rc = -ENOMEM;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
tlvs_len += sdreq->tlv_len;
|
||||
|
||||
hlist_add_head(&sdreq->node, &sdreq_list);
|
||||
}
|
||||
|
||||
if (hlist_empty(&sdreq_list)) {
|
||||
rc = -EINVAL;
|
||||
goto exit;
|
||||
}
|
||||
|
||||
rc = nfc_llcp_send_snl_sdreq(local, &sdreq_list, tlvs_len);
|
||||
exit:
|
||||
device_unlock(&dev->dev);
|
||||
|
||||
nfc_put_device(dev);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static struct genl_ops nfc_genl_ops[] = {
|
||||
{
|
||||
.cmd = NFC_CMD_GET_DEVICE,
|
||||
|
|
@ -913,6 +1080,11 @@ static struct genl_ops nfc_genl_ops[] = {
|
|||
.doit = nfc_genl_llc_set_params,
|
||||
.policy = nfc_genl_policy,
|
||||
},
|
||||
{
|
||||
.cmd = NFC_CMD_LLC_SDREQ,
|
||||
.doit = nfc_genl_llc_sdreq,
|
||||
.policy = nfc_genl_policy,
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@ struct nfc_rawsock {
|
|||
#define to_rawsock_sk(_tx_work) \
|
||||
((struct sock *) container_of(_tx_work, struct nfc_rawsock, tx_work))
|
||||
|
||||
struct nfc_llcp_sdp_tlv;
|
||||
|
||||
#ifdef CONFIG_NFC_LLCP
|
||||
|
||||
void nfc_llcp_mac_is_down(struct nfc_dev *dev);
|
||||
|
|
@ -59,6 +61,8 @@ int nfc_llcp_data_received(struct nfc_dev *dev, struct sk_buff *skb);
|
|||
struct nfc_llcp_local *nfc_llcp_find_local(struct nfc_dev *dev);
|
||||
int __init nfc_llcp_init(void);
|
||||
void nfc_llcp_exit(void);
|
||||
void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp);
|
||||
void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head);
|
||||
|
||||
#else
|
||||
|
||||
|
|
@ -112,6 +116,14 @@ static inline void nfc_llcp_exit(void)
|
|||
{
|
||||
}
|
||||
|
||||
static inline void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void nfc_llcp_free_sdp_tlv_list(struct hlist_head *sdp_head)
|
||||
{
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
int __init rawsock_init(void);
|
||||
|
|
@ -144,6 +156,8 @@ int nfc_genl_dep_link_down_event(struct nfc_dev *dev);
|
|||
int nfc_genl_tm_activated(struct nfc_dev *dev, u32 protocol);
|
||||
int nfc_genl_tm_deactivated(struct nfc_dev *dev);
|
||||
|
||||
int nfc_genl_llc_send_sdres(struct nfc_dev *dev, struct hlist_head *sdres_list);
|
||||
|
||||
struct nfc_dev *nfc_get_device(unsigned int idx);
|
||||
|
||||
static inline void nfc_put_device(struct nfc_dev *dev)
|
||||
|
|
|
|||
Loading…
Reference in New Issue