summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorRobert Dolca <robert.dolca@intel.com>2015-10-26 13:58:54 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-28 06:44:45 +0100
commitf11631748ee6973f85238109a3fa8ab8e760e5a4 (patch)
treeb95898200f6a7c40dda4f954847dd098af75b081 /include/net
parentd8e018c0b3211902af1bfb5d5b280f955a4633b7 (diff)
downloadlinux-stable-f11631748ee6973f85238109a3fa8ab8e760e5a4.tar.gz
linux-stable-f11631748ee6973f85238109a3fa8ab8e760e5a4.tar.bz2
linux-stable-f11631748ee6973f85238109a3fa8ab8e760e5a4.zip
NFC: nci: non-static functions can not be inline
This fixes a build error that seems to be toochain dependent (Not seen with gcc v5.1): In file included from net/nfc/nci/rsp.c:36:0: net/nfc/nci/rsp.c: In function ‘nci_rsp_packet’: include/net/nfc/nci_core.h:355:12: error: inlining failed in call to always_inline ‘nci_prop_rsp_packet’: function body not available inline int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 opcode, Signed-off-by: Robert Dolca <robert.dolca@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/nfc/nci_core.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index 5a1572a34c49..57ce24fb0047 100644
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -352,13 +352,13 @@ static inline int nci_set_vendor_cmds(struct nci_dev *ndev,
void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb);
void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb);
-inline int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 opcode,
+int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 opcode,
struct sk_buff *skb);
-inline int nci_prop_ntf_packet(struct nci_dev *ndev, __u16 opcode,
+int nci_prop_ntf_packet(struct nci_dev *ndev, __u16 opcode,
struct sk_buff *skb);
-inline int nci_core_rsp_packet(struct nci_dev *ndev, __u16 opcode,
+int nci_core_rsp_packet(struct nci_dev *ndev, __u16 opcode,
struct sk_buff *skb);
-inline int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode,
+int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode,
struct sk_buff *skb);
void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb);
int nci_send_cmd(struct nci_dev *ndev, __u16 opcode, __u8 plen, void *payload);