From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758593Ab3K1BcW (ORCPT ); Wed, 27 Nov 2013 20:32:22 -0500 Received: from e38.co.us.ibm.com ([32.97.110.159]:42073 "EHLO e38.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758514Ab3K1Bbx (ORCPT ); Wed, 27 Nov 2013 20:31:53 -0500 From: Zhi Yong Wu To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Zhi Yong Wu Subject: [RESEND PATCH net-next 3/4] macvtap: remove the dead branch Date: Thu, 28 Nov 2013 09:31:32 +0800 Message-Id: <1385602293-24024-4-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1385602293-24024-1-git-send-email-zwu.kernel@gmail.com> References: <1385602293-24024-1-git-send-email-zwu.kernel@gmail.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13112801-1344-0000-0000-00000398D589 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhi Yong Wu Signed-off-by: Zhi Yong Wu --- drivers/net/macvtap.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index dc76670..eeb1a97 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -780,8 +780,6 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, return -EINVAL; ret = macvtap_skb_to_vnet_hdr(skb, &vnet_hdr); - if (ret) - return ret; if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr))) return -EFAULT; -- 1.7.6.5