net-caif: add CAIF protocol definitions

Add CAIF definitions to existing header files.
Files: if_arp.h, if_ether.h, socket.h.
Types: ARPHRD_CAIF, ETH_P_CAIF, AF_CAIF, PF_CAIF, SOL_CAIF, N_CAIF

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

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index e80b7f88f7c6cda4c2cb8e42c0675b868124afc7..6d722f41ee7c760010ae26f3deea4fea1c9ca4aa 100644 (file)
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -90,6 +90,7 @@
 
 #define ARPHRD_PHONET  820             /* PhoNet media type            */
 #define ARPHRD_PHONET_PIPE 821         /* PhoNet pipe header           */
+#define ARPHRD_CAIF    822             /* CAIF media type              */
 
 #define ARPHRD_VOID      0xFFFF        /* Void type, nothing is known */
 #define ARPHRD_NONE      0xFFFE        /* zero header length */

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 299b4121f91486b90780601f2e6bc389674131e8..bed7a4682b90734935e3dd6680d5e646b0b895c0 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -109,6 +109,7 @@
 #define ETH_P_TRAILER  0x001C          /* Trailer switch tagging       */
 #define ETH_P_PHONET   0x00F5          /* Nokia Phonet frames          */
 #define ETH_P_IEEE802154 0x00F6                /* IEEE802.15.4 frame           */
+#define ETH_P_CAIF     0x00F7          /* ST-Ericsson CAIF protocol    */
 
 /*
  *     This is an Ethernet frame header.

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 7b3aae2052a6e37340ed04548487333141d925cd..960659bd8f783b9cc71fc1fb836716511e73267f 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -189,7 +189,8 @@ struct ucred {
 #define AF_ISDN                34      /* mISDN sockets                */
 #define AF_PHONET      35      /* Phonet sockets               */
 #define AF_IEEE802154  36      /* IEEE802154 sockets           */
-#define AF_MAX         37      /* For now.. */
+#define AF_CAIF                37      /* CAIF sockets                 */
+#define AF_MAX         38      /* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC      AF_UNSPEC
@@ -229,6 +230,7 @@ struct ucred {
 #define PF_ISDN                AF_ISDN
 #define PF_PHONET      AF_PHONET
 #define PF_IEEE802154  AF_IEEE802154
+#define PF_CAIF                AF_CAIF
 #define PF_MAX         AF_MAX
 
 /* Maximum queue length specifiable by listen.  */
@@ -300,6 +302,7 @@ struct ucred {
 #define SOL_PNPIPE     275
 #define SOL_RDS                276
 #define SOL_IUCV       277
+#define SOL_CAIF       278
 
 /* IPX options */
 #define IPX_TYPE       1