From patchwork Wed Nov 26 17:31:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 41556 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CB073203C2 for ; Wed, 26 Nov 2014 17:32:48 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id e53sf2232649eek.11 for ; Wed, 26 Nov 2014 09:32:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=DQ6K7Y1K6S4Kas9JwnMio98T8W1s4YvS1pHLcLfJM90=; b=CAgRUkE1dj3YWLp4+k88OLU4WfFMjNfW/955VaSTuni+kdP4VJR3Kj6y3myG1f77vh 7Spzt4CcNSr7WHXFTW28+Q6iKM8HmKOMKhXJpkBCfefmPsKslulvvf6eaSLkmrpDEXwU iqxbxotIBcdaOt1hudacNNhc+HyPGlJ6FBW6zyIuD9nV4uuolEIxR/jscSObhXHPLA7a vfrfh8ShYj7Cyc6HG5LpkHh0KqCZLhMptVB9iE7ryzjl/X5+fHBtzLpyB1oCuH9Iw6z5 HEy5jouriwtq/NA7Kk9TwsG2Y3fs0681phaxWsL7LB22fLZjrZ1Kz1lpJriU0QHaHuBq 6WWw== X-Gm-Message-State: ALoCoQnAZ7CzD0SEWGiM+zVhsSFGKrJYwcoSGaHWA8m+bVpzIo0ZzBPayH00yWUJDq7oSSg4vluz X-Received: by 10.112.169.101 with SMTP id ad5mr1816230lbc.1.1417023167624; Wed, 26 Nov 2014 09:32:47 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.10.39 with SMTP id f7ls700001lab.75.gmail; Wed, 26 Nov 2014 09:32:47 -0800 (PST) X-Received: by 10.112.184.70 with SMTP id es6mr35139311lbc.85.1417023167478; Wed, 26 Nov 2014 09:32:47 -0800 (PST) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id ri4si5064175lbb.25.2014.11.26.09.32.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Nov 2014 09:32:47 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by mail-la0-f43.google.com with SMTP id q1so2906928lam.30 for ; Wed, 26 Nov 2014 09:32:47 -0800 (PST) X-Received: by 10.153.7.170 with SMTP id dd10mr34752285lad.44.1417023167380; Wed, 26 Nov 2014 09:32:47 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp664149lbc; Wed, 26 Nov 2014 09:32:46 -0800 (PST) X-Received: by 10.229.209.136 with SMTP id gg8mr47015848qcb.16.1417023165882; Wed, 26 Nov 2014 09:32:45 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id e49si5726104qgf.97.2014.11.26.09.32.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 26 Nov 2014 09:32:45 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XtgSK-0003Mp-3U; Wed, 26 Nov 2014 17:32:44 +0000 Received: from mail-la0-f41.google.com ([209.85.215.41]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XtgS5-0003Lu-KI for lng-odp@lists.linaro.org; Wed, 26 Nov 2014 17:32:29 +0000 Received: by mail-la0-f41.google.com with SMTP id gf13so2910227lab.28 for ; Wed, 26 Nov 2014 09:32:23 -0800 (PST) X-Received: by 10.152.179.67 with SMTP id de3mr34824956lac.73.1417023143428; Wed, 26 Nov 2014 09:32:23 -0800 (PST) Received: from localhost.localdomain ([188.92.105.210]) by mx.google.com with ESMTPSA id l1sm311644lae.11.2014.11.26.09.32.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Nov 2014 09:32:22 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Wed, 26 Nov 2014 20:31:59 +0300 Message-Id: <1417023121-19867-3-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 In-Reply-To: <1417023121-19867-1-git-send-email-maxim.uvarov@linaro.org> References: <1417023121-19867-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 3/5] pktio: mac addr functions X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Define API for mac address change and implement linux-generic version. Signed-off-by: Maxim Uvarov --- platform/linux-generic/include/api/odp_packet_io.h | 23 ++++++++ platform/linux-generic/odp_packet_io.c | 67 ++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/platform/linux-generic/include/api/odp_packet_io.h b/platform/linux-generic/include/api/odp_packet_io.h index 20425be..480d930 100644 --- a/platform/linux-generic/include/api/odp_packet_io.h +++ b/platform/linux-generic/include/api/odp_packet_io.h @@ -173,6 +173,29 @@ int odp_pktio_promisc_set(odp_pktio_t id, odp_bool enable); int odp_pktio_promisc_enabled(odp_pktio_t id); /** + * Set the default MAC address of a packet IO interface. + * + * @param[in] id ODP packet IO handle. + * @param[in] mac_addr MAC address to be assigned to the interface. + * @param[in] addr_size Size of the address in bytes. + * + * @return 0 on success, -1 on error. + */ +int odp_pktio_mac_addr_set(odp_pktio_t id, const unsigned char *mac_addr, + size_t addr_size); + +/** + * Get the default MAC address of a packet IO interface. + * + * @param[in] id ODP packet IO handle. + * @param[out] mac_addr Storage for MAC address of the packet IO interface. + * + * @retval -1 on any error. + * @retval size of mac addr. + */ +int odp_pktio_mac_addr(odp_pktio_t id, unsigned char *mac_addr); + +/** * @} */ diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index b1dbc41..72531b3 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -21,6 +21,7 @@ #include #include +#include typedef struct { pktio_entry_t entries[ODP_CONFIG_PKTIO_ENTRIES]; @@ -616,3 +617,69 @@ int odp_pktio_promisc_enabled(odp_pktio_t id) else return 0; } + +int odp_pktio_mac_addr_set(odp_pktio_t id, const unsigned char *mac_addr, + size_t addr_size) +{ + pktio_entry_t *entry; + int sockfd; + struct ifreq ifr; + int ret; + + entry = get_entry(id); + if (entry == NULL) { + ODP_DBG("pktio entry %d does not exist\n", id); + return -1; + } + + if (entry->s.pkt_sock_mmap.sockfd) + sockfd = entry->s.pkt_sock_mmap.sockfd; + else + sockfd = entry->s.pkt_sock.sockfd; + + strncpy(ifr.ifr_name, entry->s.name, IFNAMSIZ - 1); + ifr.ifr_name[IFNAMSIZ] = 0; + memcpy(ifr.ifr_hwaddr.sa_data, mac_addr, addr_size); + ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER; + + ret = ioctl(sockfd, SIOCSIFHWADDR, &ifr); + if (ret < 0) { + ODP_DBG("ioctl SIOCSIFHWADDR error\n"); + return -1; + } + + return 0; +} + +int odp_pktio_mac_addr(odp_pktio_t id, unsigned char *mac_addr) +{ + pktio_entry_t *entry; + int sockfd; + struct ifreq ifr; + int ret; + + entry = get_entry(id); + if (entry == NULL) { + ODP_DBG("pktio entry %d does not exist\n", id); + return -1; + } + + if (entry->s.pkt_sock_mmap.sockfd) + sockfd = entry->s.pkt_sock_mmap.sockfd; + else + sockfd = entry->s.pkt_sock.sockfd; + + strncpy(ifr.ifr_name, entry->s.name, IFNAMSIZ - 1); + ifr.ifr_name[IFNAMSIZ] = 0; + + ret = ioctl(sockfd, SIOCGIFHWADDR, &ifr); + if (ret < 0) { + ODP_DBG("ioctl SIOCGIFHWADDR error\n"); + return -1; + } + + memcpy(mac_addr, (unsigned char *)ifr.ifr_ifru.ifru_hwaddr.sa_data, + ETH_ALEN); + + return ETH_ALEN; +}