diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 12:13:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 12:13:10 -0400 |
| commit | 7b3b6e42032e94a6132a85642e95106f5346650e (patch) | |
| tree | 8b2262291341d8a9f9b1e7e3c63a3289bb6c6de6 /include/linux/in.h | |
| parent | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into topic/asoc
Diffstat (limited to 'include/linux/in.h')
| -rw-r--r-- | include/linux/in.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/in.h b/include/linux/in.h index 4065313cd7ee..db458beef19d 100644 --- a/include/linux/in.h +++ b/include/linux/in.h | |||
| @@ -75,6 +75,7 @@ struct in_addr { | |||
| 75 | #define IP_IPSEC_POLICY 16 | 75 | #define IP_IPSEC_POLICY 16 |
| 76 | #define IP_XFRM_POLICY 17 | 76 | #define IP_XFRM_POLICY 17 |
| 77 | #define IP_PASSSEC 18 | 77 | #define IP_PASSSEC 18 |
| 78 | #define IP_TRANSPARENT 19 | ||
| 78 | 79 | ||
| 79 | /* BSD compatibility */ | 80 | /* BSD compatibility */ |
| 80 | #define IP_RECVRETOPTS IP_RETOPTS | 81 | #define IP_RECVRETOPTS IP_RETOPTS |