From patchwork Fri Nov 9 22:54:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 198157 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 8FEFE2C0085 for ; Sat, 10 Nov 2012 09:39:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756038Ab2KIWji (ORCPT ); Fri, 9 Nov 2012 17:39:38 -0500 Received: from mms2.broadcom.com ([216.31.210.18]:3393 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755968Ab2KIWjg (ORCPT ); Fri, 9 Nov 2012 17:39:36 -0500 Received: from [10.9.200.133] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Fri, 09 Nov 2012 14:37:25 -0800 X-Server-Uuid: 4500596E-606A-40F9-852D-14843D8201B2 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Fri, 9 Nov 2012 14:39:00 -0800 Received: from dell (dhcp-10-12-137-198.irv.broadcom.com [10.12.137.198]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 0D70A40FE6; Fri, 9 Nov 2012 14:39:26 -0800 (PST) From: "Michael Chan" To: davem@davemloft.net cc: netdev@vger.kernel.org, "Michael Chan" Subject: [PATCH net-next] 8021q: validate SAN MAC address Date: Fri, 9 Nov 2012 14:54:04 -0800 Message-ID: <1352501644-8444-1-git-send-email-mchan@broadcom.com> X-Mailer: git-send-email 1.5.5.GIT MIME-Version: 1.0 X-WSS-ID: 7C835A2F3QC9010718-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Some bnx2x multi-function devices are configured for FCoE only in a PCI function and only has a SAN MAC address. The current code will fail ->ndo_validate_addr() when a VLAN device is brought up over such a device. Check the real device's dev_addrs[] for a valid SAN MAC address when validating the MAC address if the regular MAC address is not valid. Signed-off-by: Michael Chan --- net/8021q/vlan_dev.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 6da96d4..9ef2d2e 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -346,6 +346,29 @@ static int vlan_dev_stop(struct net_device *dev) return 0; } +static int vlan_dev_validate_addr(struct net_device *dev) +{ + if (!is_valid_ether_addr(dev->dev_addr)) { + struct net_device *real_dev = vlan_dev_priv(dev)->real_dev; + + if (real_dev) { + struct netdev_hw_addr *ha; + + rcu_read_lock(); + for_each_dev_addr(real_dev, ha) { + if ((ha->type == NETDEV_HW_ADDR_T_SAN) && + (is_valid_ether_addr(ha->addr))) { + rcu_read_unlock(); + return 0; + } + } + rcu_read_unlock(); + } + return -EADDRNOTAVAIL; + } + return 0; +} + static int vlan_dev_set_mac_address(struct net_device *dev, void *p) { struct net_device *real_dev = vlan_dev_priv(dev)->real_dev; @@ -734,7 +757,7 @@ static const struct net_device_ops vlan_netdev_ops = { .ndo_open = vlan_dev_open, .ndo_stop = vlan_dev_stop, .ndo_start_xmit = vlan_dev_hard_start_xmit, - .ndo_validate_addr = eth_validate_addr, + .ndo_validate_addr = vlan_dev_validate_addr, .ndo_set_mac_address = vlan_dev_set_mac_address, .ndo_set_rx_mode = vlan_dev_set_rx_mode, .ndo_change_rx_flags = vlan_dev_change_rx_flags,