From patchwork Thu Aug 23 13:26:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 179652 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 543FC2C0093 for ; Thu, 23 Aug 2012 23:27:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933798Ab2HWN10 (ORCPT ); Thu, 23 Aug 2012 09:27:26 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:39327 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933236Ab2HWN1W (ORCPT ); Thu, 23 Aug 2012 09:27:22 -0400 Received: by mail-wi0-f178.google.com with SMTP id hr14so945258wib.1 for ; Thu, 23 Aug 2012 06:27:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=w+2HqfpggHYOY6BQHaj6qJTYZvffXXda6KJsx9+98Lk=; b=WFY7Y8YFT7SsyMjxrypdetIc4tKMPkw6hgrPkFgENmB+28ZWvtiJ9mVDSbgOypAgt6 iZgcS5cxfYqcofLgJ/DM2a6TeZVRMz3milO9KT8bwXwNDPZdZGJlaa9+5w3w1ZKzGZpi acMOwwzmxxjWy4CbxYalYjRsVDz199QGYLqakTT0I+Igc/hmf0eCjHGcH37n9A0zi6US dMh1O8eM773vYXzVDCO7UHUYFVJd1TBm0ZiKmeRIqKQ0MAHXiif9iiw6CS+mHiK7uGDO hGOdSTl3en88vDxKr6xaNWdTiHnhVWXWdTDEjA0we/lj5UpVLt1BnVegxsYo8M7JQClZ MUbw== Received: by 10.180.74.33 with SMTP id q1mr15046869wiv.4.1345728441488; Thu, 23 Aug 2012 06:27:21 -0700 (PDT) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id fb20sm21082356wid.1.2012.08.23.06.27.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Aug 2012 06:27:20 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, brouer@redhat.com, ogerlitz@mellanox.com Subject: [patch net-next 3/3] team: do not allow to add VLAN challenged port when vlan is used Date: Thu, 23 Aug 2012 15:26:53 +0200 Message-Id: <1345728413-10298-4-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1345728413-10298-1-git-send-email-jiri@resnulli.us> References: <1345728413-10298-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQljjWrZLY5E0nHnfAFAMawiX3uE/efpEgJb8bnI4IdGIVHAtKSgf9f/Le44fIIVe+EEolQ5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Reported-by: Or Gerlitz Signed-off-by: Jiri Pirko --- drivers/net/team/team.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 4010bcd..49629fb 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -989,6 +989,13 @@ static int team_port_add(struct team *team, struct net_device *port_dev) return -EBUSY; } + if (port_dev->features & NETIF_F_VLAN_CHALLENGED && + vlan_uses_dev(dev)) { + netdev_err(dev, "Device %s is VLAN challenged and team device has VLAN set up\n", + portname); + return -EPERM; + } + err = team_dev_type_check_change(dev, port_dev); if (err) return err;