From patchwork Mon Dec 21 22:55:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 559789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CD8EE14009B for ; Tue, 22 Dec 2015 09:57:54 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ybTFZ36G; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 2610728BD6E; Mon, 21 Dec 2015 23:56:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 36D0E28BD69 for ; Mon, 21 Dec 2015 23:56:20 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-lb0-f182.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 21 Dec 2015 23:56:11 +0100 (CET) Received: by mail-lb0-f182.google.com with SMTP id bc4so22285028lbc.2 for ; Mon, 21 Dec 2015 14:56:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=EwCNgzDgOpTIBDARZXboJvB6AAp79BY5DGa+9KAKMDw=; b=ybTFZ36GvHFayYgbRgLX4pPWRS+P6bdr0XABBn1VdgobhyVE4ny/jUWJg71x3X2XwJ sK/bkomtxYj+lJY9t/8w5Ne7cTj2vAXi6NMKsYEjUK/ggL+1tLfufeIX+ZDnhCvrq0Eo aZWn9SZk2tngbe38HLnSNNiyZG4ZuiSkWTTUL9tqwexpwuNZ2nO60BCpNaB5aAj3X2gk +tBifDLOwYRzr8OR55V0trBBSqn8YI5CgvyVya2CIea7D4gIBPudkAMJNcuTZE5vIGnb c/Q6QKMDGcy2+yZhN8nWdjXaTjdTzO5c8bv0fjE34pgEUrYJDCRZ0NFsMvM64tEssD8E bZ1Q== X-Received: by 10.112.138.10 with SMTP id qm10mr5845064lbb.139.1450738589317; Mon, 21 Dec 2015 14:56:29 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id j123sm5229328lfb.19.2015.12.21.14.56.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Dec 2015 14:56:28 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: openwrt-devel@lists.openwrt.org, Felix Fietkau Date: Mon, 21 Dec 2015 23:55:55 +0100 Message-Id: <1450738555-28718-3-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1450738555-28718-1-git-send-email-zajec5@gmail.com> References: <1450286343-5514-1-git-send-email-zajec5@gmail.com> <1450738555-28718-1-git-send-email-zajec5@gmail.com> MIME-Version: 1.0 Subject: [OpenWrt-Devel] [PATCH V2 3/3] swconfig: switch kernel PORT_LINK support to SWITCH_TYPE_LINK X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" As explained earlier, using SWITCH_TYPE_LINK gives more flexibility, it doesn't require e.g. string parsing to read some data. Signed-off-by: Rafał Miłecki --- .../linux/generic/files/drivers/net/phy/swconfig.c | 51 ++-------------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c b/target/linux/generic/files/drivers/net/phy/swconfig.c index ef218bd..07efda0 100644 --- a/target/linux/generic/files/drivers/net/phy/swconfig.c +++ b/target/linux/generic/files/drivers/net/phy/swconfig.c @@ -127,30 +127,11 @@ swconfig_get_pvid(struct switch_dev *dev, const struct switch_attr *attr, return dev->ops->get_port_pvid(dev, val->port_vlan, &val->value.i); } -static const char * -swconfig_speed_str(enum switch_port_speed speed) -{ - switch (speed) { - case SWITCH_PORT_SPEED_10: - return "10baseT"; - case SWITCH_PORT_SPEED_100: - return "100baseT"; - case SWITCH_PORT_SPEED_1000: - return "1000baseT"; - default: - break; - } - - return "unknown"; -} - static int swconfig_get_link(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { - struct switch_port_link link; - int len; - int ret; + struct switch_port_link *link = val->value.link; if (val->port_vlan >= dev->ports) return -EINVAL; @@ -158,32 +139,8 @@ swconfig_get_link(struct switch_dev *dev, const struct switch_attr *attr, if (!dev->ops->get_port_link) return -EOPNOTSUPP; - memset(&link, 0, sizeof(link)); - ret = dev->ops->get_port_link(dev, val->port_vlan, &link); - if (ret) - return ret; - - memset(dev->buf, 0, sizeof(dev->buf)); - - if (link.link) - len = snprintf(dev->buf, sizeof(dev->buf), - "port:%d link:up speed:%s %s-duplex %s%s%s%s%s", - val->port_vlan, - swconfig_speed_str(link.speed), - link.duplex ? "full" : "half", - link.tx_flow ? "txflow " : "", - link.rx_flow ? "rxflow " : "", - link.eee & ADVERTISED_100baseT_Full ? "eee100 " : "", - link.eee & ADVERTISED_1000baseT_Full ? "eee1000 " : "", - link.aneg ? "auto" : ""); - else - len = snprintf(dev->buf, sizeof(dev->buf), "port:%d link:down", - val->port_vlan); - - val->value.s = dev->buf; - val->len = len; - - return 0; + memset(link, 0, sizeof(*link)); + return dev->ops->get_port_link(dev, val->port_vlan, link); } static int @@ -246,7 +203,7 @@ static struct switch_attr default_port[] = { .get = swconfig_get_pvid, }, [PORT_LINK] = { - .type = SWITCH_TYPE_STRING, + .type = SWITCH_TYPE_LINK, .name = "link", .description = "Get port link information", .set = NULL,