diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /include/net/transp_v6.h | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'include/net/transp_v6.h')
| -rw-r--r-- | include/net/transp_v6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h index eeb077dd735f..a8122dc56410 100644 --- a/include/net/transp_v6.h +++ b/include/net/transp_v6.h | |||
| @@ -16,7 +16,7 @@ extern struct proto tcpv6_prot; | |||
| 16 | 16 | ||
| 17 | struct flowi6; | 17 | struct flowi6; |
| 18 | 18 | ||
| 19 | /* extention headers */ | 19 | /* extension headers */ |
| 20 | extern int ipv6_exthdrs_init(void); | 20 | extern int ipv6_exthdrs_init(void); |
| 21 | extern void ipv6_exthdrs_exit(void); | 21 | extern void ipv6_exthdrs_exit(void); |
| 22 | extern int ipv6_frag_init(void); | 22 | extern int ipv6_frag_init(void); |