diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-06 14:05:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-06 14:05:34 +1000 |
| commit | 37c35f6f5b758bc580a4516e4246844e284fede5 (patch) | |
| tree | caafbbf10fee7aa07134cc06bcef4fd59dedd6ba /drivers/staging/otus/wwrap.c | |
| parent | ff5f50d37e83d67b47c5d4664f7e86323887a809 (diff) | |
| parent | aeef33fad6183cdaf7a28ad5b9695e35fea6576f (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/arlan/arlan-main.c
drivers/staging/comedi/drivers/cb_das16_cs.c
drivers/staging/cx25821/cx25821-alsa.c
drivers/staging/dt3155/dt3155_drv.c
drivers/staging/netwave/netwave_cs.c
Diffstat (limited to 'drivers/staging/otus/wwrap.c')
| -rw-r--r-- | drivers/staging/otus/wwrap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c index a74f7eea56e4..b02eb42cd796 100644 --- a/drivers/staging/otus/wwrap.c +++ b/drivers/staging/otus/wwrap.c @@ -956,7 +956,6 @@ int zfLnxCencSendMsg(struct sock *netlink_sk, u_int8_t *msg, int len) /*填写数据报相关信息*/ nlh = NLMSG_PUT(skb, 0, 0, WAI_K_MSG, size-sizeof(*nlh)); pos = NLMSG_DATA(nlh); - memset(pos, 0, len); /*传输到用户空间的数据*/ memcpy(pos, msg, len); |