diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
| commit | b1b934d31d8a608fe69fc56d6e539548b55b0601 (patch) | |
| tree | e8206589759c732a3a9b70b3feeb9ef50dc3c6b3 /net/sched/em_meta.c | |
| parent | 5dd9feafb351a8bf304292623cbc63335c34d279 (diff) | |
| parent | b6ff50833ad43a8ebd9b16bf53c334f7aaf33c41 (diff) | |
| download | linux-b1b934d31d8a608fe69fc56d6e539548b55b0601.tar.gz linux-b1b934d31d8a608fe69fc56d6e539548b55b0601.tar.bz2 linux-b1b934d31d8a608fe69fc56d6e539548b55b0601.zip | |
Merge branch 'master'
Diffstat (limited to 'net/sched/em_meta.c')
| -rw-r--r-- | net/sched/em_meta.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 698372954f4d..61e3b740ab1a 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c @@ -773,10 +773,9 @@ static int em_meta_change(struct tcf_proto *tp, void *data, int len, TCF_META_ID(hdr->right.kind) > TCF_META_ID_MAX) goto errout; - meta = kmalloc(sizeof(*meta), GFP_KERNEL); + meta = kzalloc(sizeof(*meta), GFP_KERNEL); if (meta == NULL) goto errout; - memset(meta, 0, sizeof(*meta)); memcpy(&meta->lvalue.hdr, &hdr->left, sizeof(hdr->left)); memcpy(&meta->rvalue.hdr, &hdr->right, sizeof(hdr->right)); |