[IPV6]: remove more unused IPV6_AUTHHDR things.

Remove two more unused IPV6_AUTHHDR option things, 
which I failed to remove them last time,
plus, mark IPV6_AUTHHDR obsolete.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki 2005-06-28 15:46:24 -07:00 коммит произвёл David S. Miller
Родитель fb3d89498d
Коммит 7fe40f73d7
3 изменённых файлов: 1 добавлений и 3 удалений

Просмотреть файл

@ -156,7 +156,7 @@ struct in6_flowlabel_req
#define IPV6_CHECKSUM 7 #define IPV6_CHECKSUM 7
#define IPV6_HOPLIMIT 8 #define IPV6_HOPLIMIT 8
#define IPV6_NEXTHOP 9 #define IPV6_NEXTHOP 9
#define IPV6_AUTHHDR 10 #define IPV6_AUTHHDR 10 /* obsolete */
#define IPV6_FLOWINFO 11 #define IPV6_FLOWINFO 11
#define IPV6_UNICAST_HOPS 16 #define IPV6_UNICAST_HOPS 16

Просмотреть файл

@ -183,7 +183,6 @@ struct ipv6_txoptions
struct ipv6_opt_hdr *hopopt; struct ipv6_opt_hdr *hopopt;
struct ipv6_opt_hdr *dst0opt; struct ipv6_opt_hdr *dst0opt;
struct ipv6_rt_hdr *srcrt; /* Routing Header */ struct ipv6_rt_hdr *srcrt; /* Routing Header */
struct ipv6_opt_hdr *auth;
struct ipv6_opt_hdr *dst1opt; struct ipv6_opt_hdr *dst1opt;
/* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */ /* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */

Просмотреть файл

@ -244,7 +244,6 @@ struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions * opt_space,
opt_space->opt_nflen = 0; opt_space->opt_nflen = 0;
} }
opt_space->dst1opt = fopt->dst1opt; opt_space->dst1opt = fopt->dst1opt;
opt_space->auth = fopt->auth;
opt_space->opt_flen = fopt->opt_flen; opt_space->opt_flen = fopt->opt_flen;
return opt_space; return opt_space;
} }