diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-15 12:47:19 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-15 12:47:19 +0200 |
| commit | 2d9f8a6e73ef2ec8ecaa24ca98e7010d6edd089f (patch) | |
| tree | 9ea035b696137b345c69532a318f55502f530558 /include/linux/socket.h | |
| parent | ecf726f5414489fe749477eb77d6cb12bb93c8bc (diff) | |
| parent | eade7b281c9fc18401b989c77d5e5e660b25a3b7 (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 4ef98e422fde..e17f82266639 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -192,7 +192,8 @@ struct ucred { #define AF_IEEE802154 36 /* IEEE802154 sockets */ #define AF_CAIF 37 /* CAIF sockets */ #define AF_ALG 38 /* Algorithm sockets */ -#define AF_MAX 39 /* For now.. */ +#define AF_NFC 39 /* NFC sockets */ +#define AF_MAX 40 /* For now.. */ /* Protocol families, same as address families. */ #define PF_UNSPEC AF_UNSPEC @@ -234,6 +235,7 @@ struct ucred { #define PF_IEEE802154 AF_IEEE802154 #define PF_CAIF AF_CAIF #define PF_ALG AF_ALG +#define PF_NFC AF_NFC #define PF_MAX AF_MAX /* Maximum queue length specifiable by listen. */ |