From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id A801FA00E6 for ; Sun, 14 Apr 2019 11:34:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9DC4D4C8F; Sun, 14 Apr 2019 11:34:54 +0200 (CEST) Received: from smtp3.jd.com (smtp3.jd.com [59.151.64.88]) by dpdk.org (Postfix) with ESMTP id 787F25B2C for ; Wed, 10 Apr 2019 07:52:12 +0200 (CEST) Received: from BJMAILD1MBX97.360buyAD.local (172.31.0.97) by BJMAILD1MBX46.360buyAD.local (172.31.0.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1415.2; Wed, 10 Apr 2019 13:51:43 +0800 Received: from BJMAILD1MBX97.360buyAD.local (172.31.0.97) by BJMAILD1MBX97.360buyAD.local (172.31.0.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1415.2; Wed, 10 Apr 2019 13:51:43 +0800 Received: from HUB04.360buyAD.local (172.17.27.18) by BJMAILD1MBX97.360buyAD.local (172.31.0.97) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256) id 15.1.1415.2 via Frontend Transport; Wed, 10 Apr 2019 13:51:43 +0800 Received: from hb1-lan-wangyandlvs-01.hb1.jd.local (103.235.240.9) by hub04.360buyAD.local (172.17.27.18) with Microsoft SMTP Server id 14.3.361.1; Wed, 10 Apr 2019 13:51:43 +0800 From: Jie Pan To: CC: Jie Pan , Date: Wed, 10 Apr 2019 14:05:44 +0800 Message-ID: <1554876344-3910-1-git-send-email-panjie5@jd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548301983-20020-1-git-send-email-panjie5@jd.com> References: <1548301983-20020-1-git-send-email-panjie5@jd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [103.235.240.9] X-Mailman-Approved-At: Sun, 14 Apr 2019 11:34:54 +0200 Subject: [dpdk-stable] [PATCH v2] kni: fix the type for MAC address X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The type for MAC address should be unsigned. Fixes: 1cfe212ed17a ("kni: support MAC address change") Cc: stable@dpdk.org Signed-off-by: Jie Pan --- kernel/linux/kni/kni_misc.c | 2 +- lib/librte_eal/linux/eal/include/rte_kni_common.h | 2 +- lib/librte_kni/rte_kni.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c index 31845e1..b6f474d 100644 --- a/kernel/linux/kni/kni_misc.c +++ b/kernel/linux/kni/kni_misc.c @@ -447,7 +447,7 @@ struct kni_net { ether_addr_copy(net_dev->dev_addr, kni->lad_dev->dev_addr); else { /* if user has provided a valid mac address */ - if (is_valid_ether_addr((unsigned char *)(dev_info.mac_addr))) + if (is_valid_ether_addr(dev_info.mac_addr)) memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN); else /* diff --git a/lib/librte_eal/linux/eal/include/rte_kni_common.h b/lib/librte_eal/linux/eal/include/rte_kni_common.h index 5afa087..5db5a13 100644 --- a/lib/librte_eal/linux/eal/include/rte_kni_common.h +++ b/lib/librte_eal/linux/eal/include/rte_kni_common.h @@ -127,7 +127,7 @@ struct rte_kni_device_info { /* mbuf size */ unsigned mbuf_size; unsigned int mtu; - char mac_addr[6]; + uint8_t mac_addr[6]; }; #define KNI_DEVICE "kni" diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h index 9a9a7d7..c93d3a9 100644 --- a/lib/librte_kni/rte_kni.h +++ b/lib/librte_kni/rte_kni.h @@ -68,7 +68,7 @@ struct rte_kni_conf { __extension__ uint8_t force_bind : 1; /* Flag to bind kernel thread */ - char mac_addr[ETHER_ADDR_LEN]; /* MAC address assigned to KNI */ + uint8_t mac_addr[ETHER_ADDR_LEN]; /* MAC address assigned to KNI */ uint16_t mtu; }; -- 1.8.3.1