summaryrefslogtreecommitdiff
path: root/include/linux/in6.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-06-30 08:49:18 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-30 08:49:18 +0400
commit0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch)
treec40fd8818c64c5d7d1d90afab0bd6ffd94505526 /include/linux/in6.h
parent9bd481f85940726bf66aae5cd03c5b912ad0ae4c (diff)
parent9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff)
downloadlinux-0c168775709faa74c1b87f1e61046e0c51ade7f3.tar.xz
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
Diffstat (limited to 'include/linux/in6.h')
-rw-r--r--include/linux/in6.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/in6.h b/include/linux/in6.h
index f8256c582845..dcf5720ffcbb 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -156,7 +156,7 @@ struct in6_flowlabel_req
#define IPV6_CHECKSUM 7
#define IPV6_HOPLIMIT 8
#define IPV6_NEXTHOP 9
-#define IPV6_AUTHHDR 10
+#define IPV6_AUTHHDR 10 /* obsolete */
#define IPV6_FLOWINFO 11
#define IPV6_UNICAST_HOPS 16