From patchwork Fri Nov 23 01:59:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yeow Yeoh X-Patchwork-Id: 1793491 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 2FA5D3FCAE for ; Fri, 23 Nov 2012 02:09:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758820Ab2KWCJr (ORCPT ); Thu, 22 Nov 2012 21:09:47 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:37850 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758814Ab2KWCJr (ORCPT ); Thu, 22 Nov 2012 21:09:47 -0500 Received: by mail-pa0-f46.google.com with SMTP id bh2so3202568pad.19 for ; Thu, 22 Nov 2012 18:09:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=ES9GusZDcURZugDiCyNvLvnFN6Fs6dppYBHX12+weM0=; b=jCHefFif3i+7Z8wZE62MPUWrQfUaZat9psTgYULStvfhjHQv/NyTJTrWcaaQg+51Mw sCaingMk/jUmWBjd0aSiUZq5YMU22g6hlK2rJe5WjEVqj3vc7+k6RDAvoHdM2P0a7Shb ua2z+fZIJU123P51ByvMPNUKVdq61WJ6sfpMasj2hOlERuLWedmVOkH84qrgZvyaYqMu ovK33N3by9QtPxsGnhzq3yB2roB9vtk7rq47Tqv7pTAKYwBcvLJxQnxTcGfvKfJEBXlH E9FMqKZ1Eaz8y1RVjq6dn1xkbalQRgdix3tOf+aUQzbpmdGsaZqOIVytkcTuWacmCrEu +i4Q== Received: by 10.68.241.136 with SMTP id wi8mr9973205pbc.95.1353636587038; Thu, 22 Nov 2012 18:09:47 -0800 (PST) Received: from localhost.localdomain ([58.26.233.146]) by mx.google.com with ESMTPS id vi9sm2931383pbc.41.2012.11.22.18.09.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 18:09:46 -0800 (PST) From: Chun-Yeow Yeoh To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, linville@tuxdriver.com, Chun-Yeow Yeoh Subject: [PATCH] mac80211: Fix macro definitions in Mesh Date: Fri, 23 Nov 2012 09:59:18 +0800 Message-Id: <1353635958-12298-1-git-send-email-yeohchunyeow@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Macro definitions should be static inlines. Reported by: Chaoxing Lin Signed-off-by: Chun-Yeow Yeoh --- net/mac80211/mesh_hwmp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 47aeee2..5d3e965 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -88,9 +88,9 @@ static inline u32 u16_field_get(u8 *preq_elem, int offset, bool ae) (msecs_to_jiffies(s->u.mesh.mshcfg.dot11MeshHWMPpreqMinInterval)) #define max_preq_retries(s) (s->u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries) #define disc_timeout_jiff(s) \ - msecs_to_jiffies(sdata->u.mesh.mshcfg.min_discovery_timeout) + msecs_to_jiffies(s->u.mesh.mshcfg.min_discovery_timeout) #define root_path_confirmation_jiffies(s) \ - msecs_to_jiffies(sdata->u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval) + msecs_to_jiffies(s->u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval) enum mpath_frame_type { MPATH_PREQ = 0,