From patchwork Tue Mar 29 06:06:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 8682521 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7E5A6C0553 for ; Tue, 29 Mar 2016 06:08:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 989452017D for ; Tue, 29 Mar 2016 06:08:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD02F2014A for ; Tue, 29 Mar 2016 06:08:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756001AbcC2GGz (ORCPT ); Tue, 29 Mar 2016 02:06:55 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:33227 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755956AbcC2GGt (ORCPT ); Tue, 29 Mar 2016 02:06:49 -0400 Received: by mail-pf0-f174.google.com with SMTP id 4so6636955pfd.0 for ; Mon, 28 Mar 2016 23:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cZjbcUbe95Z7wLO0ZeNfFPY4yGjB4refmqx72CRBFcA=; b=GqWUjeXUnF+OKCw0f4j7l+vc9nDAysBBmCpY5bRlSTZ5e+OzJlpp9KrE61f2izWqQW qLt0EOcr5KsG4fHiNv8BK/hWgGcjIKQMJe+lS8mvEPz9g5KjiMAz/U/HkYd51CSMBWgt IdB66Xb7NchRI5PPjrQO0glNsBWO/yBEAJaUQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cZjbcUbe95Z7wLO0ZeNfFPY4yGjB4refmqx72CRBFcA=; b=Ku+hUm9DOG8GB/amO6qPKiSt35X/xCEQ8hCE4rDDvwKDAY/nZVIgl6AGPq9ugXI8lA 7dq5Hl7gecGMBf51bTkbPCgL7acsdMgSfx3mvJTDTMzfgkNXvZxKQjLde+6+gfGz6X8c E4XwMEQXJaBfO4fP1PHQy7CTW3LVrEM7sTFIS0Q96nFPy1kT69d3CqgLGybatI7/2UT4 H3LhuL6zY7spFsNIZ/gIGmrV3X9/iokUjXk1xV8bf6DU8vYNE2xaLGvKPt99IulL1ko5 e2yzprdUfD4Rsz+p3mq0+7N5/o6eTBHCPxuAbixjVMBqEf1iXAuCzdwIFLWbiLI8yNia Gdbw== X-Gm-Message-State: AD7BkJIQUfAlCYcDE/b4AD+qfWAqr+fu7CMpzxLuy1Wse07AVbaWkVpAz/A5Xo0WuMKImPQu X-Received: by 10.98.68.91 with SMTP id r88mr767048pfa.12.1459231608670; Mon, 28 Mar 2016 23:06:48 -0700 (PDT) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id k88sm39878073pfj.0.2016.03.28.23.06.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Mar 2016 23:06:48 -0700 (PDT) From: Bjorn Andersson To: Eugene Krasnikov , Kalle Valo Cc: wcn36xx@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Pontus Fuchs Subject: [PATCH 10/16] wcn36xx: Copy all members in config_sta v1 conversion Date: Mon, 28 Mar 2016 23:06:27 -0700 Message-Id: <1459231593-360-11-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459231593-360-1-git-send-email-bjorn.andersson@linaro.org> References: <1459231593-360-1-git-send-email-bjorn.andersson@linaro.org> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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: Pontus Fuchs When converting to version 1 of the config_sta struct not all members where copied. This fixes the problem of multicast frames not being delivered on an encrypted network. Signed-off-by: Pontus Fuchs Signed-off-by: Bjorn Andersson --- drivers/net/wireless/ath/wcn36xx/smd.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index 2b416ee9f105..ce764cce1a3e 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c @@ -949,17 +949,32 @@ static void wcn36xx_smd_convert_sta_to_v1(struct wcn36xx *wcn, memcpy(&v1->mac, orig->mac, ETH_ALEN); v1->aid = orig->aid; v1->type = orig->type; + v1->short_preamble_supported = orig->short_preamble_supported; v1->listen_interval = orig->listen_interval; + v1->wmm_enabled = orig->wmm_enabled; v1->ht_capable = orig->ht_capable; - + v1->tx_channel_width_set = orig->tx_channel_width_set; + v1->rifs_mode = orig->rifs_mode; + v1->lsig_txop_protection = orig->lsig_txop_protection; v1->max_ampdu_size = orig->max_ampdu_size; v1->max_ampdu_density = orig->max_ampdu_density; v1->sgi_40mhz = orig->sgi_40mhz; v1->sgi_20Mhz = orig->sgi_20Mhz; - + v1->rmf = orig->rmf; + v1->encrypt_type = orig->encrypt_type; + v1->action = orig->action; + v1->uapsd = orig->uapsd; + v1->max_sp_len = orig->max_sp_len; + v1->green_field_capable = orig->green_field_capable; + v1->mimo_ps = orig->mimo_ps; + v1->delayed_ba_support = orig->delayed_ba_support; + v1->max_ampdu_duration = orig->max_ampdu_duration; + v1->dsss_cck_mode_40mhz = orig->dsss_cck_mode_40mhz; memcpy(&v1->supported_rates, &orig->supported_rates, sizeof(orig->supported_rates)); v1->sta_index = orig->sta_index; + v1->bssid_index = orig->bssid_index; + v1->p2p = orig->p2p; } static int wcn36xx_smd_config_sta_rsp(struct wcn36xx *wcn,