diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/net/netns/xfrm.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'include/net/netns/xfrm.h')
| -rw-r--r-- | include/net/netns/xfrm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h index 1ba912749caa..56f8e5585df7 100644 --- a/include/net/netns/xfrm.h +++ b/include/net/netns/xfrm.h | |||
| @@ -43,6 +43,7 @@ struct netns_xfrm { | |||
| 43 | struct work_struct policy_hash_work; | 43 | struct work_struct policy_hash_work; |
| 44 | 44 | ||
| 45 | struct sock *nlsk; | 45 | struct sock *nlsk; |
| 46 | struct sock *nlsk_stash; | ||
| 46 | 47 | ||
| 47 | u32 sysctl_aevent_etime; | 48 | u32 sysctl_aevent_etime; |
| 48 | u32 sysctl_aevent_rseqth; | 49 | u32 sysctl_aevent_rseqth; |