From patchwork Mon Feb 22 11:49:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Grumbach, Emmanuel" X-Patchwork-Id: 586118 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 ABD27140BA4 for ; Mon, 22 Feb 2016 22:50:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754547AbcBVLuB (ORCPT ); Mon, 22 Feb 2016 06:50:01 -0500 Received: from mga11.intel.com ([192.55.52.93]:24004 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752488AbcBVLuA (ORCPT ); Mon, 22 Feb 2016 06:50:00 -0500 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP; 22 Feb 2016 03:49:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,484,1449561600"; d="scan'208";a="657086434" Received: from egrumbacbox.jer.intel.com ([10.12.125.84]) by FMSMGA003.fm.intel.com with ESMTP; 22 Feb 2016 03:49:58 -0800 From: Emmanuel Grumbach To: netdev@vger.kernel.org Cc: linux-wireless@vger.kernel.org, Emmanuel Grumbach Subject: [PATCH] codel: cast the output of MS2TIME to codel_time_t Date: Mon, 22 Feb 2016 13:49:47 +0200 Message-Id: <1456141787-18143-1-git-send-email-emmanuel.grumbach@intel.com> X-Mailer: git-send-email 2.5.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This will allow to pass the typecheck in the comparators: codel_time_{after,before} Signed-off-by: Emmanuel Grumbach --- include/net/codel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/codel.h b/include/net/codel.h index 267e702..0d92e39 100644 --- a/include/net/codel.h +++ b/include/net/codel.h @@ -62,7 +62,7 @@ typedef u32 codel_time_t; typedef s32 codel_tdiff_t; #define CODEL_SHIFT 10 -#define MS2TIME(a) ((a * NSEC_PER_MSEC) >> CODEL_SHIFT) +#define MS2TIME(a) ((codel_time_t)((a * NSEC_PER_MSEC) >> CODEL_SHIFT)) static inline codel_time_t codel_get_time(void) {