diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-08-04 22:50:27 -0400 |
| commit | d932cb7e630cae3b6b5307b767d296ff1a597c5e (patch) | |
| tree | f930d068a12a256fabef0864bcdf8e85f095369e /net/xfrm/xfrm_state.c | |
| parent | 73b59a3b1c09e4bfc678400b77b96134dcfbf112 (diff) | |
| parent | f5d635f649607b09b0b4620d25d028fd2b1b7ea5 (diff) | |
| download | talos-op-linux-d932cb7e630cae3b6b5307b767d296ff1a597c5e.tar.gz talos-op-linux-d932cb7e630cae3b6b5307b767d296ff1a597c5e.zip | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'net/xfrm/xfrm_state.c')
| -rw-r--r-- | net/xfrm/xfrm_state.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 43f00fc28a3d..0021aad5db43 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -194,10 +194,9 @@ struct xfrm_state *xfrm_state_alloc(void) { struct xfrm_state *x; - x = kmalloc(sizeof(struct xfrm_state), GFP_ATOMIC); + x = kzalloc(sizeof(struct xfrm_state), GFP_ATOMIC); if (x) { - memset(x, 0, sizeof(struct xfrm_state)); atomic_set(&x->refcnt, 1); atomic_set(&x->tunnel_users, 0); INIT_LIST_HEAD(&x->bydst); |
