From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <thomas.monjalon@6wind.com>
Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46])
by dpdk.org (Postfix) with ESMTP id D1E1256A2
for <dev@dpdk.org>; Fri, 25 Mar 2016 20:44:34 +0100 (CET)
Received: by mail-wm0-f46.google.com with SMTP id p65so32841057wmp.0
for <dev@dpdk.org>; Fri, 25 Mar 2016 12:44:34 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=6wind-com.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references;
bh=s5jca3YyJeOn7LZSSELfKDYeXsTiw60iXz+2zXrxFbs=;
b=QXIX7frHGn8adIOuRAVdg51QXJbojFnv9sNE1Lra8icF7ScW6popUftJtCNSaodrn2
NXWn/WIuUaW1kRCfOo295lkwbJABWv/LNuNn2lb0QQciC120byAuoPeU2yUoxVyqedVv
Ny/56HzvHf0srYmbPCNQfmihS3q00w9hwhQgHMr0WYhDct+4bliS3+dbrW+qWl1u1mhm
l7kuz7EXV9pMVX/PqLJc63U1ADRKNufB6Cib41HZhBPqFBGB9T1aTQYf+7ggR+VamAmn
HLnhTjzVyWHwVoOAkCBP5rJXC/yGd93yEACGdDhT8/eJsXgf+xY2OGMACG2Dn2+wBfsP
nOHA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=s5jca3YyJeOn7LZSSELfKDYeXsTiw60iXz+2zXrxFbs=;
b=Iydb6RMOmMZuo3eEVVN//+jnVfVRn4uVDenkdxwNdzPUqxD1qxfQMOxGd8P4q9/IDT
EJHPF3pBC1ZFkVGr6OjyFGhL5XoVQsiCkIOyRck/3WB2UTyMqJ4CbZsVGda75s+pWmsv
EljxOhubawEbQx+5OI5Ht45z3boSjs8vq1yWlBipOa7tKl5ETShni/DbCd0R6CvI6Nu5
1sisPM4TI4+W+ncCS2rtbwUM3rqXf5ThQ/5KY3vCLu74tiP/IDh+jgkzsmToZQ6GflVk
BjSZcTzuYTzBxjoW7EVR8jNzT2yOI0DuRC01dQbnlbHdjkXAbd9M2ioTH8AmJxFFx4oB
57vw==
X-Gm-Message-State: AD7BkJLF8f1VpJVjcSgJeOcR/CPYGi+yaZvBvsfSf6tLLf07VLCllidf5jQuoToshP3B8ufi
X-Received: by 10.194.172.3 with SMTP id ay3mr16762195wjc.155.1458935074715;
Fri, 25 Mar 2016 12:44:34 -0700 (PDT)
Received: from XPS13.localdomain (91.111.75.86.rev.sfr.net. [86.75.111.91])
by smtp.gmail.com with ESMTPSA id u4sm13240660wjz.4.2016.03.25.12.44.32
(version=TLSv1/SSLv3 cipher=OTHER);
Fri, 25 Mar 2016 12:44:34 -0700 (PDT)
From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: marcdevel@gmail.com, bruce.richardson@intel.com, declan.doherty@intel.com,
konstantin.ananyev@intel.com, wenzhuo.lu@intel.com, helin.zhang@intel.com,
jing.d.chen@intel.com, harish.patil@qlogic.com,
rahul.lakkireddy@chelsio.com, johndale@cisco.com, vido@cesnet.cz,
adrien.mazarguil@6wind.com, alejandro.lucero@netronome.com
Cc: dev@dpdk.org
Date: Fri, 25 Mar 2016 20:42:24 +0100
Message-Id: <1458934950-23333-3-git-send-email-thomas.monjalon@6wind.com>
X-Mailer: git-send-email 2.7.0
In-Reply-To: <1458934950-23333-1-git-send-email-thomas.monjalon@6wind.com>
References: <1458238145-7496-1-git-send-email-thomas.monjalon@6wind.com>
<1458934950-23333-1-git-send-email-thomas.monjalon@6wind.com>
Subject: [dpdk-dev] [PATCH v12 2/8] ethdev: use constants for link duplex
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Mar 2016 19:44:35 -0000
From: Marc Sune <marcdevel@gmail.com>
Some duplex values are replaced from 0 to half-duplex when link is down.
Some drivers are still using their own constants for duplex modes.
Signed-off-by: Marc Sune <marcdevel@gmail.com>
---
drivers/net/e1000/em_ethdev.c | 2 +-
drivers/net/e1000/igb_ethdev.c | 2 +-
drivers/net/ixgbe/ixgbe_ethdev.c | 2 +-
drivers/net/virtio/virtio_ethdev.c | 2 +-
drivers/net/virtio/virtio_ethdev.h | 2 --
lib/librte_ether/rte_ethdev.h | 2 +-
6 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index dc9ed38..fad8f2f 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -1107,7 +1107,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)
link.link_status = ETH_LINK_UP;
} else if (!link_check && (link.link_status == ETH_LINK_UP)) {
link.link_speed = 0;
- link.link_duplex = 0;
+ link.link_duplex = ETH_LINK_HALF_DUPLEX;
link.link_status = ETH_LINK_DOWN;
}
rte_em_dev_atomic_write_link_status(dev, &link);
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 045fc63..4dfa7e3 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -2062,7 +2062,7 @@ eth_igb_link_update(struct rte_eth_dev *dev, int wait_to_complete)
link.link_status = ETH_LINK_UP;
} else if (!link_check) {
link.link_speed = 0;
- link.link_duplex = 0;
+ link.link_duplex = ETH_LINK_HALF_DUPLEX;
link.link_status = ETH_LINK_DOWN;
}
rte_igb_dev_atomic_write_link_status(dev, &link);
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 129f36a..21a3b8c 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -3061,7 +3061,7 @@ ixgbe_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
link.link_status = ETH_LINK_DOWN;
link.link_speed = 0;
- link.link_duplex = 0;
+ link.link_duplex = ETH_LINK_HALF_DUPLEX;
memset(&old, 0, sizeof(old));
rte_ixgbe_dev_atomic_read_link_status(dev, &old);
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 3ebc221..63a368a 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1401,7 +1401,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet
memset(&link, 0, sizeof(link));
virtio_dev_atomic_read_link_status(dev, &link);
old = link;
- link.link_duplex = FULL_DUPLEX;
+ link.link_duplex = ETH_LINK_FULL_DUPLEX;
link.link_speed = SPEED_10G;
if (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS)) {
diff --git a/drivers/net/virtio/virtio_ethdev.h b/drivers/net/virtio/virtio_ethdev.h
index fed9571..66423a0 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -42,8 +42,6 @@
#define SPEED_100 100
#define SPEED_1000 1000
#define SPEED_10G 10000
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
#ifndef PAGE_SIZE
#define PAGE_SIZE 4096
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index c5a215a..2d13f92 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -246,7 +246,7 @@ struct rte_eth_stats {
*/
struct rte_eth_link {
uint16_t link_speed; /**< ETH_LINK_SPEED_[10, 100, 1000, 10000] */
- uint16_t link_duplex; /**< ETH_LINK_[HALF_DUPLEX, FULL_DUPLEX] */
+ uint16_t link_duplex; /**< ETH_LINK_[HALF/FULL]_DUPLEX */
uint8_t link_status : 1; /**< ETH_LINK_[DOWN/UP] */
}__attribute__((aligned(8))); /**< aligned for atomic64 read/write */
--
2.7.0