From patchwork Fri Jan 18 12:30:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1027304 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="WRTwaSzh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43h0gF5Gr1z9sBn for ; Fri, 18 Jan 2019 23:31:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727497AbfARMb3 (ORCPT ); Fri, 18 Jan 2019 07:31:29 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:50267 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727252AbfARMb2 (ORCPT ); Fri, 18 Jan 2019 07:31:28 -0500 Received: by mail-wm1-f68.google.com with SMTP id n190so4372058wmd.0 for ; Fri, 18 Jan 2019 04:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TxRydc78xzePSHNoSLRTRWwPjo+/80lHdy4wBLXC4No=; b=WRTwaSzhIlDGnfsqLtwerXmVRuyzKW//7RVuRhZ22A3TAIir9En/wN41SEErieHWnv wkbLhJy7tE2BECEs5y4xa9MHujcKLWSiiSfs0UVhvOEozYv6D1LA+VWHLlVQ0NhqKKn8 PCFBbPO08VXgsliNQCqN+E6bGDpMoeoxeGAjY= 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=TxRydc78xzePSHNoSLRTRWwPjo+/80lHdy4wBLXC4No=; b=jYRvOGY100xHVPGne3lMvn3BbIhZZtCm/4Oy5wJvc/XzKWpuyePEUeVqUKD6jYNh2H LLEYVsGsghl9M3EjPDzJzY9zzhs+t03hsUkNt9qCTiNb5Y54W78C6EmWbK4QtiyT/l8I GtnhkIjPcul6N2zLK0dfYfPSPWEImf5s8uz8UiKhMFdUNMPAYvBoYCmLWJKgMchR0Q2W jAQc/ipfLWi9J99G0AsnLmvGv+ZaHkD5zgGltHbH0QRdvoLwAZLYURXLxApQxbeLZaAQ bysyTn+79Ki/aJI7SvwhUa2MsaRjmR0AgIE6vBiestV8jmlGPy7sIhKrYsP99ubXR3jT i3eA== X-Gm-Message-State: AJcUukfAolOuQEqNRxbOV7R4HYqY5q7T8kcuFIUYa/C8X61ntwAEum7p p7yUCkO26UEr1fGJEqVmNQraQMakikY= X-Google-Smtp-Source: ALg8bN7bp6SgHl+dmmtsYpdhkT5pPt7oA7lzyHNIe6CwTmPR5NrrvOJOcid7I8rH/OHUAX2sMaGkJw== X-Received: by 2002:a1c:19c2:: with SMTP id 185mr15990747wmz.8.1547814685847; Fri, 18 Jan 2019 04:31:25 -0800 (PST) Received: from localhost.localdomain ([93.152.141.58]) by smtp.gmail.com with ESMTPSA id w16sm90904482wrp.1.2019.01.18.04.31.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Jan 2019 04:31:25 -0800 (PST) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, j.vosburgh@gmail.com, vfalico@gmail.com, andy@greyhouse.net, davem@davemloft.net, Nikolay Aleksandrov Subject: [PATCH net-next 2/4] bonding: 3ad: remove bond_3ad_rx_indication's length argument Date: Fri, 18 Jan 2019 14:30:21 +0200 Message-Id: <20190118123023.17614-3-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190118123023.17614-1-nikolay@cumulusnetworks.com> References: <20190118123023.17614-1-nikolay@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since the received lacpdu is accessed via skb_header_pointer() in bond_3ad_lacpdu_recv() we no longer need to check for skb->len's length. If the returned lacpdu pointer is not null that should be enough. Signed-off-by: Nikolay Aleksandrov --- drivers/net/bonding/bond_3ad.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index cdc43eebef9d..d8ef2350c68d 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -2348,22 +2348,17 @@ void bond_3ad_state_machine_handler(struct work_struct *work) * bond_3ad_rx_indication - handle a received frame * @lacpdu: received lacpdu * @slave: slave struct to work on - * @length: length of the data received * * It is assumed that frames that were sent on this NIC don't returned as new * received frames (loopback). Since only the payload is given to this * function, it check for loopback. */ -static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, - u16 length) +static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave) { int ret = RX_HANDLER_ANOTHER; struct bond_marker *marker; struct port *port; - if (length < sizeof(struct lacpdu)) - return ret; - port = &(SLAVE_AD_INFO(slave)->port); if (!port->slave) { net_warn_ratelimited("%s: Warning: port of slave %s is uninitialized\n", @@ -2643,7 +2638,7 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond, if (!lacpdu) return RX_HANDLER_ANOTHER; - return bond_3ad_rx_indication(lacpdu, slave, skb->len); + return bond_3ad_rx_indication(lacpdu, slave); } /**