From patchwork Wed Dec 13 00:48:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 847700 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="rrhI5y9n"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yxJ3S0SNBz9t2W for ; Wed, 13 Dec 2017 11:48:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753011AbdLMAst (ORCPT ); Tue, 12 Dec 2017 19:48:49 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35345 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752914AbdLMAsp (ORCPT ); Tue, 12 Dec 2017 19:48:45 -0500 Received: by mail-pg0-f67.google.com with SMTP id q20so545633pgv.2 for ; Tue, 12 Dec 2017 16:48:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+6GXnXOuZSuykUl5IRjPQolOJzrTxiJcLtQMo6QyBH4=; b=rrhI5y9nRxBK0zYIRnUZ3Dqj2RtrF5shVEx/Se0tJ0IbnjpLnnf+KyCHyVY88jG21s bySw2J4jC+gD0chU9nqiyJ4THnh+g52CUW9WHi23Od8dXeVTGvjFbnnrA1o3JjVl45vl TlJTpZdUnACSdLjB/Bfc5KeHGjbEhAVMURUwG7KbdtMoksrgnoskOkC34evCbQLkc/aw 2lVAbhobrlkafr3ggdMjFF4mR44yBHgwERYid75fA8zsZTZ8bgcvaDI45PVHg75m4Pnx 8gn84+GdqZxFRh5IlkaOaiTUGmNA94pk6wx+U7ClIsNxGPqzwXn/PrGpimXxHHwPnQ2m UMfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+6GXnXOuZSuykUl5IRjPQolOJzrTxiJcLtQMo6QyBH4=; b=DKhJTosSpe3DaT9uMc9u1VyCASCfmoN5Jawf9zMWxtec+WZNzpsrJKXuPfYBC9MInD mTWuKYJY39TvU+ChCWQ48RItQm+0l0KXHo+LMogdv2AYMaA/I/Cvpa5CtPhbsbMhEuNF jSiCwnhJmzoP4ZmFB1InglG7Q7nip9mGc65Qz3+p06d77xaGgWW7v+Uev0fCC2VR65JB K+WveexGhRiDl/r0rL9KKsS8Sr3uUxc3B3RD+kfbwE/Ba4+0dD7ENu+bIsqB3RnIrQIW X7cRa11fMbvDzdF9H+lThGekh8skua96/7nSRNcdHnB5rEZEKGmLEkt3qJ9sPtP2Iwee xi/A== X-Gm-Message-State: AKGB3mJre43bMhamdsWlLoBHBuXPMR2zyZTUyoWDQWLGnRmibpsgaYGD Y7Hmrr6+GRZIAoyhrrW8a7DBTA== X-Google-Smtp-Source: ACJfBov33JpQr1Kbz2UVnml4CxIUb0Q5NPHK+jSAMO17sQ+GtzZRsoIatGXpphjVlHuu2UPWQNnwxw== X-Received: by 10.84.229.5 with SMTP id b5mr4116047plk.405.1513126124478; Tue, 12 Dec 2017 16:48:44 -0800 (PST) Received: from xeon-e3.wavecable.com (76-14-207-240.or.wavecable.com. [76.14.207.240]) by smtp.gmail.com with ESMTPSA id y131sm433692pfg.125.2017.12.12.16.48.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 16:48:43 -0800 (PST) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com Cc: devel@linuxdriverproject.org, netdev@vger.kernel.org Subject: [PATCH net-next 1/6] hv_netvsc: copy_to_send buf can be void Date: Tue, 12 Dec 2017 16:48:35 -0800 Message-Id: <20171213004840.17507-2-sthemmin@microsoft.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171213004840.17507-1-sthemmin@microsoft.com> References: <20171213004840.17507-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since only caller does not care about return value. Signed-off-by: Stephen Hemminger --- drivers/net/hyperv/netvsc.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index e4bcd202a56a..9407907c4988 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -696,19 +696,18 @@ static u32 netvsc_get_next_send_section(struct netvsc_device *net_device) return NETVSC_INVALID_INDEX; } -static u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device, - unsigned int section_index, - u32 pend_size, - struct hv_netvsc_packet *packet, - struct rndis_message *rndis_msg, - struct hv_page_buffer *pb, - struct sk_buff *skb) +static void netvsc_copy_to_send_buf(struct netvsc_device *net_device, + unsigned int section_index, + u32 pend_size, + struct hv_netvsc_packet *packet, + struct rndis_message *rndis_msg, + struct hv_page_buffer *pb, + struct sk_buff *skb) { char *start = net_device->send_buf; char *dest = start + (section_index * net_device->send_section_size) + pend_size; int i; - u32 msg_size = 0; u32 padding = 0; u32 page_count = packet->cp_partial ? packet->rmsg_pgcnt : packet->page_buf_cnt; @@ -728,16 +727,11 @@ static u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device, u32 len = pb[i].len; memcpy(dest, (src + offset), len); - msg_size += len; dest += len; } - if (padding) { + if (padding) memset(dest, 0, padding); - msg_size += padding; - } - - return msg_size; } static inline int netvsc_send_pkt(