From patchwork Fri Mar 3 20:49:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Shaia X-Patchwork-Id: 9603525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DA7AF60414 for ; Fri, 3 Mar 2017 20:49:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C857C28588 for ; Fri, 3 Mar 2017 20:49:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCF012858F; Fri, 3 Mar 2017 20:49:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15CEA28588 for ; Fri, 3 Mar 2017 20:49:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752191AbdCCUtm (ORCPT ); Fri, 3 Mar 2017 15:49:42 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:26547 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752082AbdCCUtl (ORCPT ); Fri, 3 Mar 2017 15:49:41 -0500 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v23KnE5O010737 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 3 Mar 2017 20:49:15 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id v23KnEPw016725 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 3 Mar 2017 20:49:14 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v23KnDAd017107; Fri, 3 Mar 2017 20:49:13 GMT Received: from yuval-lap.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 03 Mar 2017 12:49:13 -0800 From: Yuval Shaia To: benve@cisco.com, dgoodell@cisco.com, dledford@redhat.com, sean.hefty@intel.com, hal.rosenstock@gmail.com, monis@mellanox.com, davem@davemloft.net, linux-rdma@vger.kernel.org Subject: [PATCH v1] {net, IB}/{rxe, usnic}: Utilize generic mac to eui32 function Date: Fri, 3 Mar 2017 22:49:05 +0200 Message-Id: <1488574145-27179-1-git-send-email-yuval.shaia@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This logic seems to be duplicated in (at least) three separate files. Move it to one place so code can be re-use. Signed-off-by: Yuval Shaia --- v0 -> v1: * Add missing #include * Rename to genaddrconf_ifid_eui48 --- drivers/infiniband/hw/usnic/usnic_common_util.h | 11 +++-------- drivers/infiniband/sw/rxe/rxe_net.c | 11 ++--------- include/net/addrconf.h | 18 ++++++++++++------ 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/drivers/infiniband/hw/usnic/usnic_common_util.h b/drivers/infiniband/hw/usnic/usnic_common_util.h index b54986d..09871da 100644 --- a/drivers/infiniband/hw/usnic/usnic_common_util.h +++ b/drivers/infiniband/hw/usnic/usnic_common_util.h @@ -34,6 +34,8 @@ #ifndef USNIC_CMN_UTIL_H #define USNIC_CMN_UTIL_H +#include + static inline void usnic_mac_to_gid(const char *const mac, char *raw_gid) { @@ -57,14 +59,7 @@ raw_gid[1] = 0x80; memset(&raw_gid[2], 0, 2); memcpy(&raw_gid[4], &inaddr, 4); - raw_gid[8] = mac[0]^2; - raw_gid[9] = mac[1]; - raw_gid[10] = mac[2]; - raw_gid[11] = 0xff; - raw_gid[12] = 0xfe; - raw_gid[13] = mac[3]; - raw_gid[14] = mac[4]; - raw_gid[15] = mac[5]; + genaddrconf_ifid_eui48(&raw_gid[8], mac); } static inline void diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c index 4abdeb3..23ba9e1 100644 --- a/drivers/infiniband/sw/rxe/rxe_net.c +++ b/drivers/infiniband/sw/rxe/rxe_net.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -86,18 +87,10 @@ struct rxe_dev *get_rxe_by_name(const char *name) static __be64 rxe_mac_to_eui64(struct net_device *ndev) { - unsigned char *mac_addr = ndev->dev_addr; __be64 eui64; unsigned char *dst = (unsigned char *)&eui64; - dst[0] = mac_addr[0] ^ 2; - dst[1] = mac_addr[1]; - dst[2] = mac_addr[2]; - dst[3] = 0xff; - dst[4] = 0xfe; - dst[5] = mac_addr[3]; - dst[6] = mac_addr[4]; - dst[7] = mac_addr[5]; + genaddrconf_ifid_eui48(dst, ndev->dev_addr); return eui64; } diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 8f998af..07d0341 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -105,12 +105,21 @@ int addrconf_prefix_rcv_add_addr(struct net *net, struct net_device *dev, u32 addr_flags, bool sllao, bool tokenized, __u32 valid_lft, u32 prefered_lft); +static inline void genaddrconf_ifid_eui48(u8 *eui, const char *const addr) +{ + memcpy(eui, addr, 3); + eui[0] ^= 2; + eui[3] = 0xFF; + eui[4] = 0xFE; + memcpy(eui + 5, addr + 3, 3); +} + static inline int addrconf_ifid_eui48(u8 *eui, struct net_device *dev) { if (dev->addr_len != ETH_ALEN) return -1; - memcpy(eui, dev->dev_addr, 3); - memcpy(eui + 5, dev->dev_addr + 3, 3); + + genaddrconf_ifid_eui48(eui, dev->dev_addr); /* * The zSeries OSA network cards can be shared among various @@ -128,11 +137,8 @@ static inline int addrconf_ifid_eui48(u8 *eui, struct net_device *dev) if (dev->dev_id) { eui[3] = (dev->dev_id >> 8) & 0xFF; eui[4] = dev->dev_id & 0xFF; - } else { - eui[3] = 0xFF; - eui[4] = 0xFE; - eui[0] ^= 2; } + return 0; }