aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Turner <digit@android.com>2010-12-06 13:18:37 -0800
committerAndroid Code Review <code-review@android.com>2010-12-06 13:18:37 -0800
commit8e6435ead5b118f1fd458d4acbdd0bf86754ab1b (patch)
tree2ee1c389fa7130fd85257a3560791f3d454ca725
parentbcb0a925b0d6d545bbd9a4ebd9ac61bdacbfa2fe (diff)
parent2bf3ec03c3971a2aaad61a96d78c3a541fc2caf0 (diff)
downloadbionic-8e6435ead5b118f1fd458d4acbdd0bf86754ab1b.tar.gz
Merge "Add defines for CAIF support"
-rw-r--r--libc/kernel/common/linux/if_ether.h1
-rw-r--r--libc/kernel/common/linux/socket.h4
-rw-r--r--libc/kernel/common/linux/tty.h2
3 files changed, 6 insertions, 1 deletions
diff --git a/libc/kernel/common/linux/if_ether.h b/libc/kernel/common/linux/if_ether.h
index 1ba7a9928..7e235a54d 100644
--- a/libc/kernel/common/linux/if_ether.h
+++ b/libc/kernel/common/linux/if_ether.h
@@ -84,6 +84,7 @@
#define ETH_P_TRAILER 0x001C
#define ETH_P_PHONET 0x00F5
#define ETH_P_IEEE802154 0x00F6
+#define ETH_P_CAIF 0x00F7
struct ethhdr {
unsigned char h_dest[ETH_ALEN];
diff --git a/libc/kernel/common/linux/socket.h b/libc/kernel/common/linux/socket.h
index b578df943..c30dae0d4 100644
--- a/libc/kernel/common/linux/socket.h
+++ b/libc/kernel/common/linux/socket.h
@@ -138,7 +138,8 @@ struct ucred {
#define AF_LLC 26
#define AF_TIPC 30
#define AF_BLUETOOTH 31
-#define AF_MAX 32
+#define AF_CAIF 38
+#define AF_MAX 39
#define PF_UNSPEC AF_UNSPEC
#define PF_UNIX AF_UNIX
@@ -170,6 +171,7 @@ struct ucred {
#define PF_LLC AF_LLC
#define PF_TIPC AF_TIPC
#define PF_BLUETOOTH AF_BLUETOOTH
+#define PF_CAIF AF_CAIF
#define PF_MAX AF_MAX
#define SOMAXCONN 128
diff --git a/libc/kernel/common/linux/tty.h b/libc/kernel/common/linux/tty.h
index b28791c76..b1f2eab83 100644
--- a/libc/kernel/common/linux/tty.h
+++ b/libc/kernel/common/linux/tty.h
@@ -12,4 +12,6 @@
#ifndef _LINUX_TTY_H
#define _LINUX_TTY_H
+#define N_CAIF 20
+
#endif