From patchwork Tue Dec 10 12:55:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 299465 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 A337D2C0369 for ; Wed, 11 Dec 2013 09:21:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753456Ab3LJMzz (ORCPT ); Tue, 10 Dec 2013 07:55:55 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:5192 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753023Ab3LJMzu (ORCPT ); Tue, 10 Dec 2013 07:55:50 -0500 Received: from 172.24.2.119 (EHLO szxeml209-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BMT71942; Tue, 10 Dec 2013 20:55:45 +0800 (CST) Received: from SZXEML420-HUB.china.huawei.com (10.82.67.159) by szxeml209-edg.china.huawei.com (172.24.2.184) with Microsoft SMTP Server (TLS) id 14.3.158.1; Tue, 10 Dec 2013 20:55:42 +0800 Received: from localhost (10.135.68.218) by szxeml420-hub.china.huawei.com (10.82.67.159) with Microsoft SMTP Server id 14.3.158.1; Tue, 10 Dec 2013 20:55:40 +0800 From: Yang Yingliang To: , Subject: [PATCH net-next 6/6] net_sched: make macro be enclosed in parenthesis Date: Tue, 10 Dec 2013 20:55:34 +0800 Message-ID: <1386680134-85452-7-git-send-email-yangyingliang@huawei.com> X-Mailer: git-send-email 1.8.1.msysgit.1 In-Reply-To: <1386680134-85452-1-git-send-email-yangyingliang@huawei.com> References: <1386680134-85452-1-git-send-email-yangyingliang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.135.68.218] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Macros with complex values should be enclosed in parenthesis Signed-off-by: Yang Yingliang --- net/sched/em_meta.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index e5cef956..852cd62 100644 --- a/net/sched/em_meta.c +++ b/net/sched/em_meta.c @@ -272,10 +272,12 @@ META_COLLECTOR(int_rtiif) **************************************************************************/ #define SKIP_NONLOCAL(skb) \ +({ \ if (unlikely(skb->sk == NULL)) { \ *err = -1; \ return; \ - } + } \ +}) META_COLLECTOR(int_sk_family) {