From patchwork Thu May 14 16:33:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brian Haley X-Patchwork-Id: 472407 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 B18AE1402B2 for ; Fri, 15 May 2015 02:33:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932679AbbENQdQ (ORCPT ); Thu, 14 May 2015 12:33:16 -0400 Received: from g2t2353.austin.hp.com ([15.217.128.52]:37322 "EHLO g2t2353.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932562AbbENQdQ (ORCPT ); Thu, 14 May 2015 12:33:16 -0400 Received: from g5t1633.atlanta.hp.com (g5t1633.atlanta.hp.com [16.201.144.132]) by g2t2353.austin.hp.com (Postfix) with ESMTP id 4A53DA1; Thu, 14 May 2015 16:33:14 +0000 (UTC) Received: from [10.152.32.150] (ospra1.fc.hp.com [16.79.38.118]) by g5t1633.atlanta.hp.com (Postfix) with ESMTP id 0D7CE83; Thu, 14 May 2015 16:33:12 +0000 (UTC) Message-ID: <5554CE47.8070709@hp.com> Date: Thu, 14 May 2015 12:33:11 -0400 From: Brian Haley Organization: HP Cloud Services User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: "netdev@vger.kernel.org" CC: Jiri Pirko , David Miller Subject: [PATCH] fix net/sched compile error Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix compile error in net/sched/cls_flower.c net/sched/cls_flower.c: In function ‘fl_set_key’: net/sched/cls_flower.c:240:3: error: implicit declaration of function ‘tcf_change_indev’ [-Werror=implicit-function-declaration] err = tcf_change_indev(net, tb[TCA_FLOWER_INDEV]); Introduced in 77b9900ef53ae047e36a37d13a2aa33bb2d60641 Signed-off-by: Brian Haley --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 9bc654c..8c8f34e 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -234,15 +234,15 @@ static void fl_set_key_val(struct nlattr **tb, static int fl_set_key(struct net *net, struct nlattr **tb, struct fl_flow_key *key, struct fl_flow_key *mask) { - int err; - +#ifdef CONFIG_NET_CLS_IND if (tb[TCA_FLOWER_INDEV]) { - err = tcf_change_indev(net, tb[TCA_FLOWER_INDEV]); + int err = tcf_change_indev(net, tb[TCA_FLOWER_INDEV]); if (err < 0) return err; key->indev_ifindex = err; mask->indev_ifindex = 0xffffffff; } +#endif fl_set_key_val(tb, key->eth.dst, TCA_FLOWER_KEY_ETH_DST, mask->eth.dst, TCA_FLOWER_KEY_ETH_DST_MASK,