diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
| commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
| tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /include/net/ipv6.h | |
| parent | 9bd481f85940726bf66aae5cd03c5b912ad0ae4c (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
Diffstat (limited to 'include/net/ipv6.h')
| -rw-r--r-- | include/net/ipv6.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 771b47e30f86..69324465e8b3 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
| @@ -183,7 +183,6 @@ struct ipv6_txoptions | |||
| 183 | struct ipv6_opt_hdr *hopopt; | 183 | struct ipv6_opt_hdr *hopopt; |
| 184 | struct ipv6_opt_hdr *dst0opt; | 184 | struct ipv6_opt_hdr *dst0opt; |
| 185 | struct ipv6_rt_hdr *srcrt; /* Routing Header */ | 185 | struct ipv6_rt_hdr *srcrt; /* Routing Header */ |
| 186 | struct ipv6_opt_hdr *auth; | ||
| 187 | struct ipv6_opt_hdr *dst1opt; | 186 | struct ipv6_opt_hdr *dst1opt; |
| 188 | 187 | ||
| 189 | /* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */ | 188 | /* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */ |