[NETFILTER]: nf_conntrack: automatic helper assignment for expectations

[linux-2.6-omap-h63xx.git] / net / sched / em_nbyte.c

diff --git a/net/sched/em_nbyte.c b/net/sched/em_nbyte.c
index cc80babfd79ff6870cd4b982f446721b67da777f..005db409be645a45abfd82f7694602874bc5b3ba 100644 (file)
--- a/net/sched/em_nbyte.c
+++ b/net/sched/em_nbyte.c
@@ -34,12 +34,10 @@ static int em_nbyte_change(struct tcf_proto *tp, void *data, int data_len,
                return -EINVAL;
 
        em->datalen = sizeof(*nbyte) + nbyte->len;
-       em->data = (unsigned long) kmalloc(em->datalen, GFP_KERNEL);
+       em->data = (unsigned long)kmemdup(data, em->datalen, GFP_KERNEL);
        if (em->data == 0UL)
                return -ENOBUFS;
 
-       memcpy((void *) em->data, data, em->datalen);
-
        return 0;
 }