From patchwork Thu Aug 22 12:23:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Bj=C3=B8rn_Mork?= X-Patchwork-Id: 269034 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2A2622C00BA for ; Thu, 22 Aug 2013 22:23:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752466Ab3HVMXc (ORCPT ); Thu, 22 Aug 2013 08:23:32 -0400 Received: from canardo.mork.no ([148.122.252.1]:52789 "EHLO canardo.mork.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752075Ab3HVMXb (ORCPT ); Thu, 22 Aug 2013 08:23:31 -0400 Received: from nemi.mork.no (ip6-localhost [IPv6:::1]) by canardo.mork.no (8.14.4/8.14.4) with ESMTP id r7MCNMVk016514 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Thu, 22 Aug 2013 14:23:22 +0200 Received: from bjorn by nemi.mork.no with local (Exim 4.80) (envelope-from ) id 1VCTv7-0005Gu-S6; Thu, 22 Aug 2013 14:23:21 +0200 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= To: netdev@vger.kernel.org Cc: Patrick McHardy , =?UTF-8?q?Bj=C3=B8rn=20Mork?= Subject: [PATCH] net: vlan: inherit addr_assign_type along with dev_addr Date: Thu, 22 Aug 2013 14:23:21 +0200 Message-Id: <1377174201-20236-1-git-send-email-bjorn@mork.no> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, T_DATE_IN_FUTURE_96_Q autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on canardo.mork.no X-Virus-Scanned: clamav-milter 0.97.8 at canardo X-Virus-Status: Clean Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A vlan device inheriting a random or set address should reflect this in its addr_assign_type. Signed-off-by: Bjørn Mork --- net/8021q/vlan_dev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 1cd3d2a..995684d 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -581,8 +581,10 @@ static int vlan_dev_init(struct net_device *dev) /* ipv6 shared card related stuff */ dev->dev_id = real_dev->dev_id; - if (is_zero_ether_addr(dev->dev_addr)) + if (is_zero_ether_addr(dev->dev_addr)) { memcpy(dev->dev_addr, real_dev->dev_addr, dev->addr_len); + dev->addr_assign_type = real_dev->addr_assign_type; + } if (is_zero_ether_addr(dev->broadcast)) memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);