Commit e1bf80c2 authored by Vincent Cuissard's avatar Vincent Cuissard Committed by Samuel Ortiz
Browse files

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: default avatarVincent Cuissard <cuissard@marvell.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent f1f1a7da

drivers/nfc/nfcmrvl/main.c

+9 −11
Original line number Diff line number Diff line
@@ -153,16 +153,8 @@ void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv) 
}

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 (skb->data[0] == NFCMRVL_HCI_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) 
		}

	}



	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);

drivers/nfc/nfcmrvl/nfcmrvl.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct nfcmrvl_if_ops { 
};



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_if_ops *ops,

						 struct device *dev,

drivers/nfc/nfcmrvl/usb.c

+13 −4
Original line number Diff line number Diff line
@@ -69,18 +69,27 @@ static int nfcmrvl_inc_tx(struct nfcmrvl_usb_drv_data *drv_data) 
static void nfcmrvl_bulk_complete(struct urb *urb)

{

	struct nfcmrvl_usb_drv_data *drv_data = urb->context;

	struct sk_buff *skb;

	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);



	if (!test_bit(NFCMRVL_NCI_RUNNING, &drv_data->flags))

		return;



	if (!urb->status) {

		if (nfcmrvl_nci_recv_frame(drv_data->priv, urb->transfer_buffer,

					   urb->actual_length) < 0)

			nfc_err(&drv_data->udev->dev, "corrupted Rx packet\n");

		skb = nci_skb_alloc(drv_data->priv->ndev, urb->actual_length,

				    GFP_ATOMIC);

		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))