net-caif: add CAIF Kconfig and Makefiles

Kconfig and Makefiles with options for:
CAIF:        Including caif
CAIF_DEBUG:  CAIF Debug
CAIF_NETDEV: CAIF Network Device for GPRS Contexts

Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/Kconfig b/net/Kconfig
index 68514644ce911a8b9b312777503b961c2ebf976a..e10d55c8ee5ca8258e85c4bc3adda880689a3ff4 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -280,5 +280,7 @@ source "net/wimax/Kconfig"
 
 source "net/rfkill/Kconfig"
 source "net/9p/Kconfig"
+source "net/caif/Kconfig"
+
 
 endif   # if NET

diff --git a/net/Makefile b/net/Makefile
index 1542e7268a7baa01ee4a6cb6d620a849057e795c..a5eae27aa42d95f3d47d560045a1bf4dd88c261c 100644 (file)
--- a/net/Makefile
+++ b/net/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_NETLABEL)                += netlabel/
 obj-$(CONFIG_IUCV)             += iucv/
 obj-$(CONFIG_RFKILL)           += rfkill/
 obj-$(CONFIG_NET_9P)           += 9p/
+obj-$(CONFIG_CAIF)             += caif/
 ifneq ($(CONFIG_DCB),)
 obj-y                          += dcb/
 endif

diff --git a/net/caif/Kconfig b/net/caif/Kconfig
new file mode 100644 (file)
index 0000000..cd1daf6
--- /dev/null
+++ b/net/caif/Kconfig
@@ -0,0 +1,48 @@
+#
+# CAIF net configurations
+#
+
+#menu "CAIF Support"
+comment "CAIF Support"
+menuconfig CAIF
+       tristate "Enable CAIF support"
+       select CRC_CCITT
+       default n
+       ---help---
+       The "Communication CPU to Application CPU Interface" (CAIF) is a packet
+       based connection-oriented MUX protocol developed by ST-Ericsson for use
+       with its modems. It is accessed from user space as sockets (PF_CAIF).
+
+       Say Y (or M) here if you build for a phone product (e.g. Android or
+       MeeGo ) that uses CAIF as transport, if unsure say N.
+
+       If you select to build it as module then CAIF_NETDEV also needs to be
+       built as modules. You will also need to say yes to any CAIF physical
+       devices that your platform requires.
+
+       See Documentation/networking/caif for a further explanation on how to
+       use and configure CAIF.
+
+if CAIF
+
+config  CAIF_DEBUG
+       bool "Enable Debug"
+       default n
+       --- help ---
+       Enable the inclusion of debug code in the CAIF stack.
+       Be aware that doing this will impact performance.
+       If unsure say N.
+
+
+config CAIF_NETDEV
+       tristate "CAIF GPRS Network device"
+       default CAIF
+       ---help---
+       Say Y if you will be using a CAIF based GPRS network device.
+       This can be either built-in or a loadable module,
+       If you select to build it as a built-in then the main CAIF device must
+       also be a built-in.
+       If unsure say Y.
+
+endif
+#endmenu

diff --git a/net/caif/Makefile b/net/caif/Makefile
new file mode 100644 (file)
index 0000000..34852af
--- /dev/null
+++ b/net/caif/Makefile
@@ -0,0 +1,26 @@
+ifeq ($(CONFIG_CAIF_DEBUG),1)
+CAIF_DBG_FLAGS := -DDEBUG
+endif
+
+ccflags-y := $(CAIF_FLAGS) $(CAIF_DBG_FLAGS)
+
+caif-objs := caif_dev.o \
+       cfcnfg.o cfmuxl.o cfctrl.o  \
+       cffrml.o cfveil.o cfdbgl.o\
+       cfserl.o cfdgml.o  \
+       cfrfml.o cfvidl.o cfutill.o \
+       cfsrvl.o cfpkt_skbuff.o caif_config_util.o
+clean-dirs:= .tmp_versions
+
+clean-files:= \
+       Module.symvers \
+       modules.order \
+       *.cmd \
+       *.o \
+       *~
+
+obj-$(CONFIG_CAIF) += caif.o
+obj-$(CONFIG_CAIF_NETDEV) += chnl_net.o
+obj-$(CONFIG_CAIF) += caif_socket.o
+
+export-objs := caif.o