diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:32 +0200 |
| commit | 5d641e7bbb8ed48f231bc902eecab2cc598f34a4 (patch) | |
| tree | 1be4ef1941355af508cc203838560a50707851bc /include/linux/if_tunnel.h | |
| parent | 9ae76f5d8ab546660cf517bb63c64de51800955d (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into safe-poison-pointerstip-safe-poison-pointers-2008-06-25_10.24_Wed
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 { __u16 __reserved; __u32 datalen; __u32 __reserved2; - void __user *data; + /* data follows */ }; /* PRL flags */ |