From 528dc4522ce8e2292e80ef9ab8b5d5b1d01cb685 Mon Sep 17 00:00:00 2001
From: Sjur Braendeland <sjur.brandeland@stericsson.com>
Date: Tue, 30 Mar 2010 13:56:19 +0000
Subject: [PATCH] --- yaml --- r: 193875 b: refs/heads/master c:
 70596b612c04694806a31dd389bd796c035085fa h: refs/heads/master i:   193873:
 a79b66bc9bf73fce3b0c6e9df7a8994a5a333987   193871:
 375e774e89dc1450efc23f83b53ae22bbda6064f v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/if_arp.h   | 1 +
 trunk/include/linux/if_ether.h | 1 +
 trunk/include/linux/socket.h   | 5 ++++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2dabefa43df9..a2d28d29940f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c45cd43ff791cc4ab6a6332165ad53d7bcb3673
+refs/heads/master: 70596b612c04694806a31dd389bd796c035085fa
diff --git a/trunk/include/linux/if_arp.h b/trunk/include/linux/if_arp.h
index e80b7f88f7c6..6d722f41ee7c 100644
--- a/trunk/include/linux/if_arp.h
+++ b/trunk/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/trunk/include/linux/if_ether.h b/trunk/include/linux/if_ether.h
index 299b4121f914..bed7a4682b90 100644
--- a/trunk/include/linux/if_ether.h
+++ b/trunk/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/trunk/include/linux/socket.h b/trunk/include/linux/socket.h
index 7b3aae2052a6..960659bd8f78 100644
--- a/trunk/include/linux/socket.h
+++ b/trunk/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