diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
| commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
| tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /include/linux/if_tunnel.h | |
| parent | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (diff) | |
| parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) | |
Merge branch 'linux-2.6'
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 */ |