From patchwork Wed Oct 22 23:35:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 402319 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 8B9EE14007F for ; Thu, 23 Oct 2014 10:36:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933345AbaJVXge (ORCPT ); Wed, 22 Oct 2014 19:36:34 -0400 Received: from vps0.lunn.ch ([178.209.37.122]:42327 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932666AbaJVXgd (ORCPT ); Wed, 22 Oct 2014 19:36:33 -0400 Received: from lunn by vps0.lunn.ch with local (Exim 4.80) (envelope-from ) id 1Xh5RH-0005Rr-Bk; Thu, 23 Oct 2014 01:35:35 +0200 From: Andrew Lunn To: davem@davemloft.net Cc: netdev@vger.kernel.org, Andrew Lunn , alexander.h.duyck@intel.com Subject: [PATCH 1/2] net: dsa: Error out on tagging protocol mismatches Date: Thu, 23 Oct 2014 01:35:17 +0200 Message-Id: <1414020918-20903-2-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1414020918-20903-1-git-send-email-andrew@lunn.ch> References: <1414020918-20903-1-git-send-email-andrew@lunn.ch> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If there is a mismatch between enabled tagging protocols and the protocol the switch supports, error out, rather than continue with a situation which is unlikely to work. Signed-off-by: Andrew Lunn cc: alexander.h.duyck@intel.com --- net/dsa/dsa.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 22f34cf4cb27..8a31bd81a315 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c @@ -175,7 +175,8 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index, break; #endif default: - break; + ret = -ENOPROTOOPT; + goto out; } dst->tag_protocol = drv->tag_protocol;