diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-30 18:42:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-30 18:42:13 +0100 |
| commit | c4a4ddaefbef3c5135c3167bd5e067859d71e84c (patch) | |
| tree | 1c44a7de360774a272495593d2bb67853380da82 /net/l2tp/l2tp_core.h | |
| parent | 6fc16e58adf50c0f1e4478538983fb5ff6f453d4 (diff) | |
| parent | 8723b795aaa0c5f0b9db2099af575f5e089a63f1 (diff) | |
| download | linux-c4a4ddaefbef3c5135c3167bd5e067859d71e84c.tar.gz | |
Merge tag 'asoc-fix-v3.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A few of the Coverity fixes from Takashi, one of which (the wm_hubs one)
is particularly noticable.
Diffstat (limited to 'net/l2tp/l2tp_core.h')
| -rw-r--r-- | net/l2tp/l2tp_core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h index 66a559b104b6..6f251cbc2ed7 100644 --- a/net/l2tp/l2tp_core.h +++ b/net/l2tp/l2tp_core.h @@ -194,6 +194,9 @@ struct l2tp_tunnel { struct sock *sock; /* Parent socket */ int fd; /* Parent fd, if tunnel socket * was created by userspace */ +#if IS_ENABLED(CONFIG_IPV6) + bool v4mapped; +#endif struct work_struct del_work; |