diff options
| author |   Frederic Danis <frederic.danis@linux.intel.com> | 2013-05-22 11:36:17 +0200 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2013-06-14 00:25:53 +0200 |
| commit | 1095e69f47926db6f1350a9d6a38626521580e87 (patch) | |
| tree | 0519d46f84f0904f2d8b8c843857645d8b358284 /include/net/nfc | |
| parent | NFC: pn533: Fix error return code in pn533_probe() (diff) | |
| download | linux-dev-1095e69f47926db6f1350a9d6a38626521580e87.tar.xz linux-dev-1095e69f47926db6f1350a9d6a38626521580e87.zip | |
NFC: NCI: Fix skb->dev usage
skb->dev is used for carrying a net_device pointer and not
an nci_dev pointer.
Remove usage of skb-dev to carry nci_dev and replace it by parameter
in nci_recv_frame(), nci_send_frame() and driver send() functions.
NfcWilink driver is also updated to use those functions.
Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/net/nfc')
| -rw-r--r-- | include/net/nfc/nci_core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h index 5bc0c460edc0..1009d3dcb316 100644 --- a/include/net/nfc/nci_core.h +++ b/include/net/nfc/nci_core.h @@ -66,7 +66,7 @@ struct nci_dev; struct nci_ops { int (*open)(struct nci_dev *ndev); int (*close)(struct nci_dev *ndev); - int (*send)(struct sk_buff *skb); + int (*send)(struct nci_dev *ndev, struct sk_buff *skb); }; #define NCI_MAX_SUPPORTED_RF_INTERFACES 4 @@ -153,7 +153,7 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops, void nci_free_device(struct nci_dev *ndev); int nci_register_device(struct nci_dev *ndev); void nci_unregister_device(struct nci_dev *ndev); -int nci_recv_frame(struct sk_buff *skb); +int nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb); static inline struct sk_buff *nci_skb_alloc(struct nci_dev *ndev, unsigned int len, |