diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-12 22:19:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-12 22:19:46 -0400 |
| commit | 6fb9114e4bc4b9144306bc2c64abd18b364409d7 (patch) | |
| tree | a9e58416c5f77cd0764331ba81833f2313e07bb7 /include/linux | |
| parent | 03e1ad7b5d871d4189b1da3125c2f12d1b5f7d0b (diff) | |
| parent | 05f175cdcf9d3615c1633615d87891ebfb729401 (diff) | |
Merge branch 'net-2.6.26-misc-20080412b' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/in6.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/in6.h b/include/linux/in6.h index e6aa8de2b939..bc492048c349 100644 --- a/include/linux/in6.h +++ b/include/linux/in6.h | |||
| @@ -48,6 +48,14 @@ extern const struct in6_addr in6addr_any; | |||
| 48 | #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } | 48 | #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } |
| 49 | extern const struct in6_addr in6addr_loopback; | 49 | extern const struct in6_addr in6addr_loopback; |
| 50 | #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } | 50 | #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } |
| 51 | #ifdef __KERNEL__ | ||
| 52 | extern const struct in6_addr in6addr_linklocal_allnodes; | ||
| 53 | #define IN6ADDR_LINKLOCAL_ALLNODES_INIT \ | ||
| 54 | { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } | ||
| 55 | extern const struct in6_addr in6addr_linklocal_allrouters; | ||
| 56 | #define IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \ | ||
| 57 | { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } } | ||
| 58 | #endif | ||
| 51 | 59 | ||
| 52 | struct sockaddr_in6 { | 60 | struct sockaddr_in6 { |
| 53 | unsigned short int sin6_family; /* AF_INET6 */ | 61 | unsigned short int sin6_family; /* AF_INET6 */ |