From patchwork Mon Oct 19 04:28:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Yamamoto X-Patchwork-Id: 532118 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 052071402D1 for ; Mon, 19 Oct 2015 15:29:38 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 77392108BD; Sun, 18 Oct 2015 21:29:33 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 69C4F108BB for ; Sun, 18 Oct 2015 21:29:32 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id E73D742008E for ; Sun, 18 Oct 2015 22:29:31 -0600 (MDT) X-ASG-Debug-ID: 1445228971-09eadd3d2a8f990001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id BIYnL6bj6dApHNKF (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 18 Oct 2015 22:29:31 -0600 (MDT) X-Barracuda-Envelope-From: yamamoto@midokura.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mail-pa0-f49.google.com) (209.85.220.49) by mx1-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 19 Oct 2015 04:29:31 -0000 Received-SPF: neutral (mx1-pf1.cudamail.com: 209.85.220.49 is neither permitted nor denied by SPF record at spf.mandrillapp.com) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.49 Received: by pasz6 with SMTP id z6so17524800pas.2 for ; Sun, 18 Oct 2015 21:29:30 -0700 (PDT) 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=1KjPkpIqXmqZUan6OQi528o0cCc6N9gMBAwqxXzGFXM=; b=fa9MuFKQF1UvIXehePNTOggrc7vU/kAv31y8NKyFSas6cEdS/nAWU6Txg5glPyJlVE naSoXhHkSeH2DtV+u9+jRA5wHlOlkuDlURlqr9KqCjqElcfrutZqmOuf9qK+A3zHfB84 PaDiIXDRO1NJZtki4D5th36E1SVpZPnTOVJDB+YKUFQ0sViqXwfdh/YnL1IZbFeYD3tB VAgW9dZ0ZGJ/1mPYeaSd+1Y1o6LA85+/UyvEGRuv34+JcJOI01sB1bhS+BLuSOQ0T9Yy IEsjtJ4g5TKTe07COcRrW6KpOM5VnNDa+Jm9wQdWjOHFAZ9sT1j2qMYQwh1W8N2gxebf YcEA== X-Gm-Message-State: ALoCoQlEdgaamcMLVnKak3+mx2+kxnjQQrq4JSYRBDjsR8jmlFiU4TRXo/K6+FbyfQa31NFEhVo/ X-Received: by 10.66.121.195 with SMTP id lm3mr32409508pab.84.1445228970552; Sun, 18 Oct 2015 21:29:30 -0700 (PDT) Received: from giraffe.local.net (p2916125-ipngn18101marunouchi.tokyo.ocn.ne.jp. [153.226.221.125]) by smtp.gmail.com with ESMTPSA id we9sm33794799pab.3.2015.10.18.21.29.29 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Oct 2015 21:29:30 -0700 (PDT) X-CudaMail-Envelope-Sender: yamamoto@midokura.com X-Barracuda-Apparent-Source-IP: 153.226.221.125 From: YAMAMOTO Takashi To: dev@openvswitch.org X-CudaMail-MID: CM-E1-1017033200 X-CudaMail-DTE: 101815 X-CudaMail-Originating-IP: 209.85.220.49 Date: Mon, 19 Oct 2015 13:28:55 +0900 X-ASG-Orig-Subj: [##CM-E1-1017033200##][PATCH 04/21] netdev-bsd: Update after eth_addr changes Message-Id: <1445228952-22445-4-git-send-email-yamamoto@midokura.com> X-Mailer: git-send-email 2.3.8 (Apple Git-58) In-Reply-To: <1445228952-22445-1-git-send-email-yamamoto@midokura.com> References: <1445228952-22445-1-git-send-email-yamamoto@midokura.com> X-GBUdb-Analysis: 0, 209.85.220.49, Ugly c=0.369283 p=-0.722222 Source Normal X-MessageSniffer-Rules: 0-0-0-4396-c X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1445228971 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=3.0 tests=BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.23618 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Cc: YAMAMOTO Takashi Subject: [ovs-dev] [PATCH 04/21] netdev-bsd: Update after eth_addr changes X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: YAMAMOTO Takashi Acked-by: Ben Pfaff --- lib/netdev-bsd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index 60e5615..118ef32 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -1753,7 +1753,7 @@ set_etheraddr(const char *netdev_name OVS_UNUSED, int hwaddr_family OVS_UNUSED, if (error) { return error; } - if (!memcmp(&sdl->sdl_data[sdl->sdl_nlen], mac, hwaddr_len)) { + if (!memcmp(&sdl->sdl_data[sdl->sdl_nlen], &mac, hwaddr_len)) { return 0; } oldaddr = req.addr; @@ -1765,7 +1765,7 @@ set_etheraddr(const char *netdev_name OVS_UNUSED, int hwaddr_family OVS_UNUSED, sdl->sdl_len = offsetof(struct sockaddr_dl, sdl_data) + hwaddr_len; sdl->sdl_alen = hwaddr_len; sdl->sdl_family = hwaddr_family; - memcpy(sdl->sdl_data, mac, hwaddr_len); + memcpy(sdl->sdl_data, &mac, hwaddr_len); error = af_link_ioctl(SIOCALIFADDR, &req); if (error) { return error;