From patchwork Thu Apr 20 07:02:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Agner X-Patchwork-Id: 9689731 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9F082600C8 for ; Thu, 20 Apr 2017 07:01:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9231F28445 for ; Thu, 20 Apr 2017 07:01:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8723C2845C; Thu, 20 Apr 2017 07:01:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 327B928445 for ; Thu, 20 Apr 2017 07:01:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942585AbdDTHBC (ORCPT ); Thu, 20 Apr 2017 03:01:02 -0400 Received: from mail.kmu-office.ch ([178.209.48.109]:44432 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S942565AbdDTHBA (ORCPT ); Thu, 20 Apr 2017 03:01:00 -0400 Received: from trochilidae.lan (unknown [IPv6:2601:602:8801:c3e0::edf]) by mail.kmu-office.ch (Postfix) with ESMTPSA id CC51C5C09CD; Thu, 20 Apr 2017 09:00:47 +0200 (CEST) From: Stefan Agner To: johannes@sipsolutions.net Cc: davem@davemloft.net, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Agner Subject: [PATCH] mac80211: fix enumeration type Date: Thu, 20 Apr 2017 00:02:36 -0700 Message-Id: <20170420070236.8334-1-stefan@agner.ch> X-Mailer: git-send-email 2.12.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=agner.ch; s=dkim; t=1492671649; bh=XD150jBf9NfsgshfNPDcCtD3KC/dBQMabt5ZFwAuhi8=; h=From:To:Cc:Subject:Date:Message-Id; b=v89TJlIDXsI2v7BA2HToTl3D2wprvAQKCbdMDCjEbkH5hFTAOeB6+LcdM+a6Be9i4w/r3pdD9oay0j9bDordNRgfCs9Rcxk38g03Z5+G2jaaeGgtffpNNm594tsR/IPcaJPP3lDFiP7bMpsqCdf9SDtFvF9j9Lxx0RNxP/n5LmM= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use enum nl80211_channel_type for cfg80211_chandef_create function calls. This does not has an effect in practise since the enum values are equal. This fixes a warning when compiling with clang: warning: implicit conversion from enumeration type 'enum nl80211_chan_width' to different enumeration type 'enum nl80211_channel_type' Signed-off-by: Stefan Agner --- net/mac80211/ibss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 98999d3d5262..5b748025147d 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -425,7 +425,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, case NL80211_CHAN_WIDTH_5: case NL80211_CHAN_WIDTH_10: cfg80211_chandef_create(&chandef, cbss->channel, - NL80211_CHAN_WIDTH_20_NOHT); + NL80211_CHAN_HT20); chandef.width = sdata->u.ibss.chandef.width; break; case NL80211_CHAN_WIDTH_80: @@ -437,7 +437,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, default: /* fall back to 20 MHz for unsupported modes */ cfg80211_chandef_create(&chandef, cbss->channel, - NL80211_CHAN_WIDTH_20_NOHT); + NL80211_CHAN_HT20); break; }