diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /include/linux/if_tunnel.h | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'include/linux/if_tunnel.h')
| -rw-r--r-- | include/linux/if_tunnel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h index f1fbe9c930d7..d4efe4014705 100644 --- a/include/linux/if_tunnel.h +++ b/include/linux/if_tunnel.h | |||
| @@ -41,7 +41,7 @@ struct ip_tunnel_prl { | |||
| 41 | __u16 __reserved; | 41 | __u16 __reserved; |
| 42 | __u32 datalen; | 42 | __u32 datalen; |
| 43 | __u32 __reserved2; | 43 | __u32 __reserved2; |
| 44 | void __user *data; | 44 | /* data follows */ |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | /* PRL flags */ | 47 | /* PRL flags */ |