OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFC: nfcmrvl: update nci recv frame API 

Update internal nci recv frame API to use skbuff phy management
to generic part of the driver.

Signed-off-by: Vincent Cuissard <cuissard@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Vincent Cuissard 2015-06-11 11:25:44 +02:00 committed by Samuel Ortiz
parent f1f1a7da2b
commit e1bf80c2a5
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/nfc/nfcmrvl/main.c
View File

@ -153,16 +153,8 @@ void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv)
} }
EXPORT_SYMBOL_GPL(nfcmrvl_nci_unregister_dev); EXPORT_SYMBOL_GPL(nfcmrvl_nci_unregister_dev);
int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, void *data, int count) int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, struct sk_buff *skb)
{ {
struct sk_buff *skb;
skb = nci_skb_alloc(priv->ndev, count, GFP_ATOMIC);
if (!skb)
return -ENOMEM;
memcpy(skb_put(skb, count), data, count);
if (priv->hci_muxed) { if (priv->hci_muxed) {
if (skb->data[0] == NFCMRVL_HCI_EVENT_CODE && if (skb->data[0] == NFCMRVL_HCI_EVENT_CODE &&
skb->data[1] == NFCMRVL_HCI_NFC_EVENT_CODE) { skb->data[1] == NFCMRVL_HCI_NFC_EVENT_CODE) {
@ -175,9 +167,15 @@ int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, void *data, int count)
} }
} }
nci_recv_frame(priv->ndev, skb); if (test_bit(NFCMRVL_NCI_RUNNING, &priv->flags))
nci_recv_frame(priv->ndev, skb);
else {
/* Drop this packet since nobody wants it */
kfree_skb(skb);
return 0;
}
return count; return 0;
} }
EXPORT_SYMBOL_GPL(nfcmrvl_nci_recv_frame); EXPORT_SYMBOL_GPL(nfcmrvl_nci_recv_frame);

2
drivers/nfc/nfcmrvl/nfcmrvl.h
View File

@ -58,7 +58,7 @@ struct nfcmrvl_if_ops {
}; };
void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv); void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv);
int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, void *data, int count); int nfcmrvl_nci_recv_frame(struct nfcmrvl_private *priv, struct sk_buff *skb);
struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data, struct nfcmrvl_private *nfcmrvl_nci_register_dev(void *drv_data,
struct nfcmrvl_if_ops *ops, struct nfcmrvl_if_ops *ops,
struct device *dev, struct device *dev,

17
drivers/nfc/nfcmrvl/usb.c
View File

@ -69,18 +69,27 @@ static int nfcmrvl_inc_tx(struct nfcmrvl_usb_drv_data *drv_data)
static void nfcmrvl_bulk_complete(struct urb *urb) static void nfcmrvl_bulk_complete(struct urb *urb)
{ {
struct nfcmrvl_usb_drv_data *drv_data = urb->context; struct nfcmrvl_usb_drv_data *drv_data = urb->context;
struct sk_buff *skb;
int err; int err;
dev_dbg(&drv_data->udev->dev, "urb %p status %d count %d", dev_dbg(&drv_data->udev->dev, "urb %p status %d count %d\n",
urb, urb->status, urb->actual_length); urb, urb->status, urb->actual_length);
if (!test_bit(NFCMRVL_NCI_RUNNING, &drv_data->flags)) if (!test_bit(NFCMRVL_NCI_RUNNING, &drv_data->flags))
return; return;
if (!urb->status) { if (!urb->status) {
if (nfcmrvl_nci_recv_frame(drv_data->priv, urb->transfer_buffer, skb = nci_skb_alloc(drv_data->priv->ndev, urb->actual_length,
urb->actual_length) < 0) GFP_ATOMIC);
nfc_err(&drv_data->udev->dev, "corrupted Rx packet\n"); if (!skb) {
nfc_err(&drv_data->udev->dev, "failed to alloc mem\n");
} else {
memcpy(skb_put(skb, urb->actual_length),
urb->transfer_buffer, urb->actual_length);
if (nfcmrvl_nci_recv_frame(drv_data->priv, skb) < 0)
nfc_err(&drv_data->udev->dev,
"corrupted Rx packet\n");
}
} }
if (!test_bit(NFCMRVL_USB_BULK_RUNNING, &drv_data->flags)) if (!test_bit(NFCMRVL_USB_BULK_RUNNING, &drv_data->flags))