diff --git a/[refs] b/[refs] index e881babdbefc..129f1add2be7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7e7031aea1215da499b51fea0ade6b92f1232af +refs/heads/master: 8d1fe5eaa3b796609a8e2b7dad2480e623c19819 diff --git a/trunk/drivers/staging/otus/wwrap.c b/trunk/drivers/staging/otus/wwrap.c index a74f7eea56e4..b02eb42cd796 100644 --- a/trunk/drivers/staging/otus/wwrap.c +++ b/trunk/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);