diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-13 02:30:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-13 02:30:45 -0400 |
| commit | bf47f4b0babe287f250dd720b41ecad9b8f7ac9b (patch) | |
| tree | 0829ef3bff455f98155b5cb0e91b71db36de3510 /include/linux/ipv6.h | |
| parent | 0b9715e64f7d46a9620d4d5042a5e28f5595ed54 (diff) | |
| parent | 5b285cac3570a935aaa28312c1ea28f9e01c5452 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 0e269038bb38..99e1ab7e3eec 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h | |||
| @@ -383,6 +383,7 @@ struct raw6_sock { | |||
| 383 | __u32 checksum; /* perform checksum */ | 383 | __u32 checksum; /* perform checksum */ |
| 384 | __u32 offset; /* checksum offset */ | 384 | __u32 offset; /* checksum offset */ |
| 385 | struct icmp6_filter filter; | 385 | struct icmp6_filter filter; |
| 386 | __u32 ip6mr_table; | ||
| 386 | /* ipv6_pinfo has to be the last member of raw6_sock, see inet6_sk_generic */ | 387 | /* ipv6_pinfo has to be the last member of raw6_sock, see inet6_sk_generic */ |
| 387 | struct ipv6_pinfo inet6; | 388 | struct ipv6_pinfo inet6; |
| 388 | }; | 389 | }; |