From e5e3d94cce0f526f9148e00fdba1b8fafacb3413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Sun, 13 Jan 2013 16:02:06 +0000 Subject: [PATCH] --- yaml --- r: 351375 b: refs/heads/master c: 25d46f43a911b08c5aa8c8fd4fe7fa9b36445068 h: refs/heads/master i: 351373: 04709d4abd4260f678a755998e4592d12b9b1450 351371: 91ff282e90d249b1bd7fc6ea5b73d45bf45de82d 351367: 5fbd50bab2769c9a15041f05b882ac3f8a284619 351359: 69dc7623760bee4f15a3096616a328cb80df3c19 v: v3 --- [refs] | 2 +- trunk/include/linux/in6.h | 4 ++++ trunk/include/uapi/linux/in6.h | 5 ----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8fc8f80f4fa2..9dc075143e2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4412a681a995d733e51cc1f6394b5db428613c3 +refs/heads/master: 25d46f43a911b08c5aa8c8fd4fe7fa9b36445068 diff --git a/trunk/include/linux/in6.h b/trunk/include/linux/in6.h index 9e2ae26fb598..a16e19349ec0 100644 --- a/trunk/include/linux/in6.h +++ b/trunk/include/linux/in6.h @@ -22,6 +22,10 @@ #include +/* IPv6 Wildcard Address (::) and Loopback Address (::1) defined in RFC2553 + * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined + * in network byte order, not in host byte order as are the IPv4 equivalents + */ extern const struct in6_addr in6addr_any; #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } extern const struct in6_addr in6addr_loopback; diff --git a/trunk/include/uapi/linux/in6.h b/trunk/include/uapi/linux/in6.h index f79c3721da6e..5673b97dcf54 100644 --- a/trunk/include/uapi/linux/in6.h +++ b/trunk/include/uapi/linux/in6.h @@ -38,11 +38,6 @@ struct in6_addr { #define s6_addr32 in6_u.u6_addr32 }; -/* IPv6 Wildcard Address (::) and Loopback Address (::1) defined in RFC2553 - * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined - * in network byte order, not in host byte order as are the IPv4 equivalents - */ - struct sockaddr_in6 { unsigned short int sin6_family; /* AF_INET6 */ __be16 sin6_port; /* Transport layer port # */