From patchwork Fri Mar 20 15:42:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Shearman X-Patchwork-Id: 452692 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 81A50140079 for ; Sat, 21 Mar 2015 02:44:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751229AbbCTPoC (ORCPT ); Fri, 20 Mar 2015 11:44:02 -0400 Received: from mx0b-000f0801.pphosted.com ([67.231.152.113]:34909 "EHLO mx0b-000f0801.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750823AbbCTPoA (ORCPT ); Fri, 20 Mar 2015 11:44:00 -0400 Received: from pps.filterd (m0000700.ppops.net [127.0.0.1]) by mx0b-000f0801.pphosted.com (8.14.7/8.14.7) with SMTP id t2KFYK7p013954; Fri, 20 Mar 2015 08:43:58 -0700 Received: from hq1wp-exchub02.corp.brocade.com ([144.49.131.13]) by mx0b-000f0801.pphosted.com with ESMTP id 1t84kn1t7v-1 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Fri, 20 Mar 2015 08:43:58 -0700 Received: from BRMWP-EXCHUB02.corp.brocade.com (172.16.187.99) by HQ1WP-EXCHUB02.corp.brocade.com (10.70.38.101) with Microsoft SMTP Server (TLS) id 14.3.123.3; Fri, 20 Mar 2015 08:43:58 -0700 Received: from EMEAWP-CASH01.corp.brocade.com (172.29.18.10) by BRMWP-EXCHUB02.corp.brocade.com (172.16.187.99) with Microsoft SMTP Server (TLS) id 14.3.123.3; Fri, 20 Mar 2015 09:43:56 -0600 Received: from BRA-2XN4P12.brocade.com (10.72.36.3) by imapeu.brocade.com (172.29.18.15) with Microsoft SMTP Server (TLS) id 8.3.298.1; Fri, 20 Mar 2015 16:43:53 +0100 From: Robert Shearman To: CC: , Robert Shearman , "Eric W. Biederman" Subject: [PATCH net-next v2 2/5] mpls: Remove incorrect PHP comment Date: Fri, 20 Mar 2015 15:42:47 +0000 Message-ID: <1426866170-28739-3-git-send-email-rshearma@brocade.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1426866170-28739-1-git-send-email-rshearma@brocade.com> References: <1426800772-22378-1-git-send-email-rshearma@brocade.com> <1426866170-28739-1-git-send-email-rshearma@brocade.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68, 1.0.33, 0.0.0000 definitions=2015-03-20_05:2015-03-20, 2015-03-20, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=1 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1503200157 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Popping the last label on the stack does not necessarily imply performing penultimate hop popping. There is no reason why this couldn't be the last hop in the network, so remove the comment. Cc: "Eric W. Biederman" Signed-off-by: Robert Shearman --- net/mpls/af_mpls.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 0d6763a..bf3459a 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -199,7 +199,6 @@ static int mpls_forward(struct sk_buff *skb, struct net_device *dev, skb->protocol = htons(ETH_P_MPLS_UC); if (unlikely(!new_header_size && dec.bos)) { - /* Penultimate hop popping */ if (!mpls_egress(rt, skb, dec)) goto drop; } else {