Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 70596b612c04694806a31dd389bd796c035085fa

Authored by Sjur Braendeland
Committed by David S. Miller
1 parent 2c45cd43ff
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 3 changed files with 6 additions and 1 deletions Side-by-side Diff

include/linux/if_arp.h
Diff comments   View file @ 70596b6
... ... @@ -90,6 +90,7 @@
90 90  
91 91 #define ARPHRD_PHONET 820 /* PhoNet media type */
92 92 #define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */
  93 +#define ARPHRD_CAIF 822 /* CAIF media type */
93 94  
94 95 #define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */
95 96 #define ARPHRD_NONE 0xFFFE /* zero header length */
include/linux/if_ether.h
Diff comments   View file @ 70596b6
... ... @@ -109,6 +109,7 @@
109 109 #define ETH_P_TRAILER 0x001C /* Trailer switch tagging */
110 110 #define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */
111 111 #define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */
  112 +#define ETH_P_CAIF 0x00F7 /* ST-Ericsson CAIF protocol */
112 113  
113 114 /*
114 115 * This is an Ethernet frame header.
include/linux/socket.h
Diff comments   View file @ 70596b6
... ... @@ -189,7 +189,8 @@
189 189 #define AF_ISDN 34 /* mISDN sockets */
190 190 #define AF_PHONET 35 /* Phonet sockets */
191 191 #define AF_IEEE802154 36 /* IEEE802154 sockets */
192   -#define AF_MAX 37 /* For now.. */
  192 +#define AF_CAIF 37 /* CAIF sockets */
  193 +#define AF_MAX 38 /* For now.. */
193 194  
194 195 /* Protocol families, same as address families. */
195 196 #define PF_UNSPEC AF_UNSPEC
... ... @@ -229,6 +230,7 @@
229 230 #define PF_ISDN AF_ISDN
230 231 #define PF_PHONET AF_PHONET
231 232 #define PF_IEEE802154 AF_IEEE802154
  233 +#define PF_CAIF AF_CAIF
232 234 #define PF_MAX AF_MAX
233 235  
234 236 /* Maximum queue length specifiable by listen. */
... ... @@ -300,6 +302,7 @@
300 302 #define SOL_PNPIPE 275
301 303 #define SOL_RDS 276
302 304 #define SOL_IUCV 277
  305 +#define SOL_CAIF 278
303 306  
304 307 /* IPX options */
305 308 #define IPX_TYPE 1