diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/net/netns/xfrm.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
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; |