summaryrefslogtreecommitdiff
path: root/include/linux/in6.h
diff options
context:
space:
mode:
authorAndy Grover <agrover@groveronline.com>2003-03-20 18:45:08 -0800
committerAndy Grover <agrover@groveronline.com>2003-03-20 18:45:08 -0800
commitff6e14381a7c1597c4ffbeb760e9802f3ebaebb2 (patch)
treef5463b22c7b9b67342cde9e46f1d3a3068019ec8 /include/linux/in6.h
parentecabd7d2dd8117b1ec4cc4b7303a7e8198843684 (diff)
parentaa43a933c82fe96479cd5e260a221b69409a553b (diff)
Merge groveronline.com:/root/bk/linux-2.5
into groveronline.com:/root/bk/linux-acpi
Diffstat (limited to 'include/linux/in6.h')
-rw-r--r--include/linux/in6.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/in6.h b/include/linux/in6.h
index ee7e68e39d9e..051db67aee69 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -65,6 +65,8 @@ struct ipv6_mreq {
int ipv6mr_ifindex;
};
+#define ipv6mr_acaddr ipv6mr_multiaddr
+
struct in6_flowlabel_req
{
struct in6_addr flr_dst;
@@ -166,6 +168,8 @@ struct in6_flowlabel_req
#define IPV6_MTU 24
#define IPV6_RECVERR 25
#define IPV6_V6ONLY 26
+#define IPV6_JOIN_ANYCAST 27
+#define IPV6_LEAVE_ANYCAST 28
/* IPV6_MTU_DISCOVER values */
#define IPV6_PMTUDISC_DONT 0