From patchwork Wed Nov 7 18:25:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Heimes X-Patchwork-Id: 994421 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42qvxS3hHGz9s7h; Thu, 8 Nov 2018 05:26:04 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gKSWd-0005Do-Py; Wed, 07 Nov 2018 18:25:59 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gKSWc-0005CX-2A for kernel-team@lists.ubuntu.com; Wed, 07 Nov 2018 18:25:58 +0000 Received: from mail-lj1-f200.google.com ([209.85.208.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1gKSWb-0002G9-Pv for kernel-team@lists.ubuntu.com; Wed, 07 Nov 2018 18:25:57 +0000 Received: by mail-lj1-f200.google.com with SMTP id v74-v6so4195307lje.6 for ; Wed, 07 Nov 2018 10:25:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=0j/J3CjUcyik4TXSxULES1slOHKC21/PSqlx65QdZjQ=; b=BY8sPsw1hiSbSJd3QgEU7Mf6fIHpBtRFZ/ExHkUA45x1CkweN6C+xDCil+D2x22bqJ SiZ0we5crDfsX0cpZkLs+rMYiWOJjKTYYoDujNEcOwM2sksedH2NC8uMWcyuU0yZrEcL L7x6W9d2Agt0KNLLANSOOd2IhAYyVsaZkNmi+35xTG/7lw6aiuUrzt3KBh1NcvSL7//8 U+5rSph9EgUNYln66M5Vme22qJVt+sNQR9btZeXuomIINxjfrUA7AwlJFXdfyTG3PeoA +P8NhM8zubcXnHjVCKjVRdFoXrfHLygonTvFrYuAHtzf6x2QyHL/nS0zhfYeV7Ldq1Yr 1EbQ== X-Gm-Message-State: AGRZ1gJUU2JJDy4XqDEv3axZq0YQroyriMD2iw4+TXCAJO0hg3wdbWX5 VAN6+Wx/CddJONHD2410Uc68/vvmdWJMWcEgUgqlODHThM59AioJCkPSAx3YaWGsxRmsAr3n8Ar 886uunUC2i9WDzxorRefzTon3UdZRdwZClIWucvGH9fsME5P9DUNeepYQwA== X-Received: by 2002:a2e:1603:: with SMTP id w3-v6mr843936ljd.33.1541615156945; Wed, 07 Nov 2018 10:25:56 -0800 (PST) X-Google-Smtp-Source: AJdET5cSvdeABWJh7I00Q1Etw5OXQl0D25+MOC0cl3AX3QkzqhIXYswtHfLMlfHFiIrK1qX7Ll5Bm56iHRvuKDc6UJ8= X-Received: by 2002:a2e:1603:: with SMTP id w3-v6mr843927ljd.33.1541615156634; Wed, 07 Nov 2018 10:25:56 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Frank Heimes Date: Wed, 7 Nov 2018 19:25:45 +0100 Message-ID: Subject: [SRU][Cosmic][Bionic][PATCH 5/6] s390/qeth: consolidate qeth MAC address helpers To: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Julian Wiedmann BugLink: http://bugs.launchpad.net/bugs/1797367 s390/qeth: consolidate qeth MAC address helpers For adding/removing a MAC address, use just one helper each that handles both unicast and multicast. Saves one level of indirection for multicast addresses, while improving the error reporting for unicast addresses. Signed-off-by: Julian Wiedmann Signed-off-by: David S. Miller (cherry-picked from commit 8174aa8aceefd3f97aebe6cc428cc3fd7b6ac2fa) Signed-off-by: Frank Heimes --- struct qeth_mac *mac; @@ -639,12 +628,12 @@ static void qeth_l2_set_rx_mode(struct net_device *dev) hash_for_each_safe(card->mac_htable, i, tmp, mac, hnode) { if (mac->disp_flag == QETH_DISP_ADDR_DELETE) { - qeth_l2_remove_mac(card, mac); + qeth_l2_remove_mac(card, mac->mac_addr); hash_del(&mac->hnode); kfree(mac); } else if (mac->disp_flag == QETH_DISP_ADDR_ADD) { - rc = qeth_l2_write_mac(card, mac); + rc = qeth_l2_write_mac(card, mac->mac_addr); if (rc) { hash_del(&mac->hnode); kfree(mac); diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 88dd929..94079e2 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c @@ -156,48 +156,37 @@ static int qeth_l2_send_delmac(struct qeth_card *card, __u8 *mac) return rc; } -static int qeth_l2_send_setgroupmac(struct qeth_card *card, __u8 *mac) +static int qeth_l2_write_mac(struct qeth_card *card, u8 *mac) { + enum qeth_ipa_cmds cmd = is_multicast_ether_addr_64bits(mac) ? + IPA_CMD_SETGMAC : IPA_CMD_SETVMAC; int rc; - QETH_CARD_TEXT(card, 2, "L2Sgmac"); - rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETGMAC); + QETH_CARD_TEXT(card, 2, "L2Wmac"); + rc = qeth_l2_send_setdelmac(card, mac, cmd); if (rc == -EEXIST) - QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s\n", - mac, QETH_CARD_IFNAME(card)); + QETH_DBF_MESSAGE(2, "MAC %pM already registered on %s\n", + mac, QETH_CARD_IFNAME(card)); else if (rc) - QETH_DBF_MESSAGE(2, "Could not set group MAC %pM on %s: %d\n", - mac, QETH_CARD_IFNAME(card), rc); + QETH_DBF_MESSAGE(2, "Failed to register MAC %pM on %s: %d\n", + mac, QETH_CARD_IFNAME(card), rc); return rc; } -static int qeth_l2_send_delgroupmac(struct qeth_card *card, __u8 *mac) +static int qeth_l2_remove_mac(struct qeth_card *card, u8 *mac) { + enum qeth_ipa_cmds cmd = is_multicast_ether_addr_64bits(mac) ? + IPA_CMD_DELGMAC : IPA_CMD_DELVMAC; int rc; - QETH_CARD_TEXT(card, 2, "L2Dgmac"); - rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_DELGMAC); + QETH_CARD_TEXT(card, 2, "L2Rmac"); + rc = qeth_l2_send_setdelmac(card, mac, cmd); if (rc) - QETH_DBF_MESSAGE(2, - "Could not delete group MAC %pM on %s: %d\n", - mac, QETH_CARD_IFNAME(card), rc); + QETH_DBF_MESSAGE(2, "Failed to delete MAC %pM on %s: %d\n", + mac, QETH_CARD_IFNAME(card), rc); return rc; } -static int qeth_l2_write_mac(struct qeth_card *card, struct qeth_mac *mac) -{ - if (is_multicast_ether_addr_64bits(mac->mac_addr)) - return qeth_l2_send_setgroupmac(card, mac->mac_addr); - return qeth_l2_send_setdelmac(card, mac->mac_addr, IPA_CMD_SETVMAC); -} - -static int qeth_l2_remove_mac(struct qeth_card *card, struct qeth_mac *mac) -{ - if (is_multicast_ether_addr_64bits(mac->mac_addr)) - return qeth_l2_send_delgroupmac(card, mac->mac_addr); - return qeth_l2_send_setdelmac(card, mac->mac_addr, IPA_CMD_DELVMAC); -} - static void qeth_l2_del_all_macs(struct qeth_card *card) {