From patchwork Mon Jan 13 20:21:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 3480271 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6A7B19F2E9 for ; Mon, 13 Jan 2014 20:22:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA64820161 for ; Mon, 13 Jan 2014 20:22:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8CDC2015E for ; Mon, 13 Jan 2014 20:22:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752088AbaAMUWX (ORCPT ); Mon, 13 Jan 2014 15:22:23 -0500 Received: from mail-ea0-f175.google.com ([209.85.215.175]:63514 "EHLO mail-ea0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752034AbaAMUWR (ORCPT ); Mon, 13 Jan 2014 15:22:17 -0500 Received: by mail-ea0-f175.google.com with SMTP id z10so3558109ead.34 for ; Mon, 13 Jan 2014 12:22:16 -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:in-reply-to:references; bh=7F5yYkbE1o2/0NnwnqTSebAvMDTxZsCo0LVTm6MB7Y4=; b=YBlT8LAjt29Q/MIpfg4gH9jjgW/Bf/MiyOc7tmnPOAfsEVcc0UwzHHKQTEHJhlHwpc rn1ccKheVzUGzZkOOjbz4xXbbdbQLIUWcgbNJCl904SPsuVHSnDL6GrS+YTlt7enO6av YB/2T8HnEVW7aeZYUrazQ25drSaOcVP661WLwUl6MXrvXMReItc2v4w+O56coEc0mWpS UoOii5m5/cxBwf+5+oI4Y2AshehXRJofZ4jOTQKO7mdxwATVJ62q2cwCwJI8SG+sL/Zr rsg0/TO7VlRFmaVg2hP2d98eqOVcX18FfOKiiP+BYkBaBrQ2XHMZ/kO2VOU6PsCo69O0 YieQ== X-Received: by 10.14.176.195 with SMTP id b43mr29396493eem.39.1389644536749; Mon, 13 Jan 2014 12:22:16 -0800 (PST) Received: from localhost.localdomain (89-139-17-131.bb.netvision.net.il. [89.139.17.131]) by mx.google.com with ESMTPSA id 4sm42757579eed.14.2014.01.13.12.22.15 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Jan 2014 12:22:16 -0800 (PST) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Johannes Berg , Emmanuel Grumbach Subject: [PATCH 11/18] iwlwifi: mvm: use array indexing instead of treating it as a pointer Date: Mon, 13 Jan 2014 22:21:50 +0200 Message-Id: <1389644517-22807-11-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <52D44A46.4000805@gmail.com> References: <52D44A46.4000805@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Berg It's a bit strange to treat an array as a pointer, so use proper array indexing instead. Signed-off-by: Johannes Berg Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index 208771a..797b4d9 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -262,9 +262,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) mvm->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD; /* currently FW API supports only one optional cipher scheme */ - if (mvm->fw->cs->cipher) { + if (mvm->fw->cs[0].cipher) { mvm->hw->n_cipher_schemes = 1; - mvm->hw->cipher_schemes = mvm->fw->cs; + mvm->hw->cipher_schemes = &mvm->fw->cs[0]; } #ifdef CONFIG_PM_SLEEP