From patchwork Tue Jun 2 06:29:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roopa Prabhu X-Patchwork-Id: 479304 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 668701412DF for ; Tue, 2 Jun 2015 16:29:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=JIpR5XaO; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754613AbbFBG3k (ORCPT ); Tue, 2 Jun 2015 02:29:40 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34520 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754261AbbFBG3f (ORCPT ); Tue, 2 Jun 2015 02:29:35 -0400 Received: by payr10 with SMTP id r10so43821885pay.1 for ; Mon, 01 Jun 2015 23:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id; bh=do4hIJY1mlHu/wmFjh4ZeBVSmw8ekr1ywyNV2EEMZaA=; b=JIpR5XaONt8jdGGm0cDGDCY/n9SfKRrbPmGeuhNiBfIGK0MGjqWdNKqT85SUAHwK2n lj0wX6GI0EW/r7BUe2vWGkfXFNHpnoCCucpwp86DMP0uGUGnU2Y/fLpIRidrqXJPTUsN gNNStg9MUzKBHhalW75F1E0DfIN9OmaK1Dmo0= 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; bh=do4hIJY1mlHu/wmFjh4ZeBVSmw8ekr1ywyNV2EEMZaA=; b=LC4sFkvSGKlJ+PqlOsipz4bXMMTTUSQ0lWBYOjikIrtm76xWG44VsXyX9s9W15JE8/ 5kVWPKuqh/bOmHTTrZggUk0M+s/sd5Iu9kBXgLXxP44iCK+jXNZbUWvh6EUmDlny3+l4 C1wjlI5cCPegYBk+MkzcRgwpIPDq9J311/oPfxjA7/36T3zdQNTSKeWf/I38LUkrjlzn w29JbuF5NoXAfgfHdVUQZxAeHMDymimpH2xevVGEAL4DfUHYmSOKpjVmgGS4MwOEG3DQ b2aSPX8RrWvPCkbFCR/p/BUewov4KyXLh9rza99NSD+rWxoTCPbKrdBa24LIBOeGhqoc RTTQ== X-Gm-Message-State: ALoCoQlAtolXhI4b0aVktyif067kdWPh36nvrZNge/K8FQ1BkbUQ9RMnSgI4zPq24ZjOs6RA06lv X-Received: by 10.70.55.41 with SMTP id o9mr46945835pdp.80.1433226575095; Mon, 01 Jun 2015 23:29:35 -0700 (PDT) Received: from hydra-01.cumulusnetworks.com ([216.129.126.126]) by mx.google.com with ESMTPSA id qt4sm16251198pbc.86.2015.06.01.23.29.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jun 2015 23:29:34 -0700 (PDT) From: Roopa Prabhu X-Google-Original-From: Roopa Prabhu To: ebiederm@xmission.com, stephen@networkplumber.org Cc: davem@davemloft.net, rshearma@brocade.com, netdev@vger.kernel.org, vivek@cumulusnetworks.com Subject: [PATCH net v3 2/2] mpls: fix mpls route deletes to not check for route scope Date: Mon, 1 Jun 2015 23:29:27 -0700 Message-Id: <1433226567-23302-3-git-send-email-roopa@cumulusnetworks.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Roopa Prabhu Ignore scope for route del messages Signed-off-by: Vivek Venkataraman Signed-off-by: Roopa Prabhu Reviewed-by: Robert Shearman --- net/mpls/af_mpls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 7b3f732..82dadab 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -693,7 +693,8 @@ static int rtm_to_route_config(struct sk_buff *skb, struct nlmsghdr *nlh, * (or source specific address in the case of multicast) * all addresses have universal scope. */ - if (rtm->rtm_scope != RT_SCOPE_UNIVERSE) + if (nlh->nlmsg_type != RTM_DELROUTE && + rtm->rtm_scope != RT_SCOPE_UNIVERSE) goto errout; if (rtm->rtm_type != RTN_UNICAST) goto errout;