aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-04-29 15:08:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-04-29 15:08:47 -0400
commita8a48e60a468084ef6ec23c78e8903c9e0ba7a4c (patch)
tree74ee5f70d6930e0fd6b54975d3c903d4eeb7a7c4 /net
parentcc0446bfeb3a9038c881db77d30c68a2beb4fa60 (diff)
parentc204ea092eead40d2ac577fc3b5c77052ec22a59 (diff)
Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says: "With this one we have: - One patch for moving the LLCP code into net/nfc. It fixes a build annoyance reported by Dave Miller caused by the fact that the LLCP code object targets are not in the same directory as the Makefile trying to build them is. It prevents us from doing e.g. make net/nfc/llcp/sock.o Moving the LLCP code into net/nfc and not making it optional anymore makes sense as LLCP is a fundamental piece of the NFC specifications and thus should be in the core NFC directory. - One patch that fixes the missing dependency against RFKILL. Without it NFC fails to properly build when it's builtin and CONFIG_RFKILL=m." Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/nfc/Kconfig2
-rw-r--r--net/nfc/Makefile6
-rw-r--r--net/nfc/llcp.h (renamed from net/nfc/llcp/llcp.h)0
-rw-r--r--net/nfc/llcp/Kconfig7
-rw-r--r--net/nfc/llcp_commands.c (renamed from net/nfc/llcp/commands.c)2
-rw-r--r--net/nfc/llcp_core.c (renamed from net/nfc/llcp/llcp.c)2
-rw-r--r--net/nfc/llcp_sock.c (renamed from net/nfc/llcp/sock.c)2
-rw-r--r--net/nfc/netlink.c3
-rw-r--r--net/nfc/nfc.h64
9 files changed, 9 insertions, 79 deletions
diff --git a/net/nfc/Kconfig b/net/nfc/Kconfig
index 60c3bbb63e8e..5948b2fc72f6 100644
--- a/net/nfc/Kconfig
+++ b/net/nfc/Kconfig
@@ -4,6 +4,7 @@
4 4
5menuconfig NFC 5menuconfig NFC
6 depends on NET 6 depends on NET
7 depends on RFKILL || !RFKILL
7 tristate "NFC subsystem support" 8 tristate "NFC subsystem support"
8 default n 9 default n
9 help 10 help
@@ -15,6 +16,5 @@ menuconfig NFC
15 16
16source "net/nfc/nci/Kconfig" 17source "net/nfc/nci/Kconfig"
17source "net/nfc/hci/Kconfig" 18source "net/nfc/hci/Kconfig"
18source "net/nfc/llcp/Kconfig"
19 19
20source "drivers/nfc/Kconfig" 20source "drivers/nfc/Kconfig"
diff --git a/net/nfc/Makefile b/net/nfc/Makefile
index d1a117c2c401..fb799deaed4f 100644
--- a/net/nfc/Makefile
+++ b/net/nfc/Makefile
@@ -5,6 +5,8 @@
5obj-$(CONFIG_NFC) += nfc.o 5obj-$(CONFIG_NFC) += nfc.o
6obj-$(CONFIG_NFC_NCI) += nci/ 6obj-$(CONFIG_NFC_NCI) += nci/
7obj-$(CONFIG_NFC_HCI) += hci/ 7obj-$(CONFIG_NFC_HCI) += hci/
8#obj-$(CONFIG_NFC_LLCP) += llcp/
9
10nfc-objs := core.o netlink.o af_nfc.o rawsock.o llcp_core.o llcp_commands.o \
11 llcp_sock.o
8 12
9nfc-objs := core.o netlink.o af_nfc.o rawsock.o
10nfc-$(CONFIG_NFC_LLCP) += llcp/llcp.o llcp/commands.o llcp/sock.o
diff --git a/net/nfc/llcp/llcp.h b/net/nfc/llcp.h
index ff8c434f7df8..ff8c434f7df8 100644
--- a/net/nfc/llcp/llcp.h
+++ b/net/nfc/llcp.h
diff --git a/net/nfc/llcp/Kconfig b/net/nfc/llcp/Kconfig
deleted file mode 100644
index a1a41cd68255..000000000000
--- a/net/nfc/llcp/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
1config NFC_LLCP
2 depends on NFC
3 bool "NFC LLCP support"
4 default n
5 help
6 Say Y here if you want to build support for a kernel NFC LLCP
7 implementation. \ No newline at end of file
diff --git a/net/nfc/llcp/commands.c b/net/nfc/llcp_commands.c
index 094f7e27e910..c1b23eef83ca 100644
--- a/net/nfc/llcp/commands.c
+++ b/net/nfc/llcp_commands.c
@@ -26,7 +26,7 @@
26 26
27#include <net/nfc/nfc.h> 27#include <net/nfc/nfc.h>
28 28
29#include "../nfc.h" 29#include "nfc.h"
30#include "llcp.h" 30#include "llcp.h"
31 31
32static u8 llcp_tlv_length[LLCP_TLV_MAX] = { 32static u8 llcp_tlv_length[LLCP_TLV_MAX] = {
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp_core.c
index 9e483c8e52f8..158bdbf668cc 100644
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp_core.c
@@ -24,7 +24,7 @@
24#include <linux/list.h> 24#include <linux/list.h>
25#include <linux/nfc.h> 25#include <linux/nfc.h>
26 26
27#include "../nfc.h" 27#include "nfc.h"
28#include "llcp.h" 28#include "llcp.h"
29 29
30static u8 llcp_magic[3] = {0x46, 0x66, 0x6d}; 30static u8 llcp_magic[3] = {0x46, 0x66, 0x6d};
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp_sock.c
index fd01ac6e0bf4..4950c189705e 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp_sock.c
@@ -24,7 +24,7 @@
24#include <linux/module.h> 24#include <linux/module.h>
25#include <linux/nfc.h> 25#include <linux/nfc.h>
26 26
27#include "../nfc.h" 27#include "nfc.h"
28#include "llcp.h" 28#include "llcp.h"
29 29
30static int sock_wait_state(struct sock *sk, int state, unsigned long timeo) 30static int sock_wait_state(struct sock *sk, int state, unsigned long timeo)
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 73fd51098f4d..f0c4d61f37c0 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -28,8 +28,7 @@
28#include <linux/slab.h> 28#include <linux/slab.h>
29 29
30#include "nfc.h" 30#include "nfc.h"
31 31#include "llcp.h"
32#include "llcp/llcp.h"
33 32
34static struct genl_multicast_group nfc_genl_event_mcgrp = { 33static struct genl_multicast_group nfc_genl_event_mcgrp = {
35 .name = NFC_GENL_MCAST_EVENT_NAME, 34 .name = NFC_GENL_MCAST_EVENT_NAME,
diff --git a/net/nfc/nfc.h b/net/nfc/nfc.h
index 94bfe19ba678..afa1f84ba040 100644
--- a/net/nfc/nfc.h
+++ b/net/nfc/nfc.h
@@ -48,8 +48,6 @@ struct nfc_rawsock {
48 48
49struct nfc_llcp_sdp_tlv; 49struct nfc_llcp_sdp_tlv;
50 50
51#ifdef CONFIG_NFC_LLCP
52
53void nfc_llcp_mac_is_down(struct nfc_dev *dev); 51void nfc_llcp_mac_is_down(struct nfc_dev *dev);
54void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx, 52void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx,
55 u8 comm_mode, u8 rf_mode); 53 u8 comm_mode, u8 rf_mode);
@@ -64,68 +62,6 @@ void nfc_llcp_exit(void);
64void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp); 62void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp);
65void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head); 63void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head);
66 64
67#else
68
69static inline void nfc_llcp_mac_is_down(struct nfc_dev *dev)
70{
71}
72
73static inline void nfc_llcp_mac_is_up(struct nfc_dev *dev, u32 target_idx,
74 u8 comm_mode, u8 rf_mode)
75{
76}
77
78static inline int nfc_llcp_register_device(struct nfc_dev *dev)
79{
80 return 0;
81}
82
83static inline void nfc_llcp_unregister_device(struct nfc_dev *dev)
84{
85}
86
87static inline int nfc_llcp_set_remote_gb(struct nfc_dev *dev,
88 u8 *gb, u8 gb_len)
89{
90 return 0;
91}
92
93static inline u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *gb_len)
94{
95 *gb_len = 0;
96 return NULL;
97}
98
99static inline int nfc_llcp_data_received(struct nfc_dev *dev,
100 struct sk_buff *skb)
101{
102 return 0;
103}
104
105static inline struct nfc_llcp_local *nfc_llcp_find_local(struct nfc_dev *dev)
106{
107 return NULL;
108}
109
110static inline int nfc_llcp_init(void)
111{
112 return 0;
113}
114
115static inline void nfc_llcp_exit(void)
116{
117}
118
119static inline void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp)
120{
121}
122
123static inline void nfc_llcp_free_sdp_tlv_list(struct hlist_head *sdp_head)
124{
125}
126
127#endif
128
129int __init rawsock_init(void); 65int __init rawsock_init(void);
130void rawsock_exit(void); 66void rawsock_exit(void);
131 67
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-24 05:06:28 -0400