From patchwork Sun Jul 6 09:36:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 4489871 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EF654BEECB for ; Sun, 6 Jul 2014 09:38:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2B3F020256 for ; Sun, 6 Jul 2014 09:38:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5781C20254 for ; Sun, 6 Jul 2014 09:38:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751784AbaGFJh4 (ORCPT ); Sun, 6 Jul 2014 05:37:56 -0400 Received: from mail-we0-f178.google.com ([74.125.82.178]:47295 "EHLO mail-we0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751459AbaGFJhD (ORCPT ); Sun, 6 Jul 2014 05:37:03 -0400 Received: by mail-we0-f178.google.com with SMTP id x48so3124542wes.23 for ; Sun, 06 Jul 2014 02:37:01 -0700 (PDT) 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=nVQuEsJf0Egs8WLADEAcOySQB7zAicYLdZQ6nTOA6Kw=; b=vfZgyBwytYfApDZlDj6dSGlxdDMl0tR1wVyjgqtpWGvaKc/0NK3gksrrWQM37DUjvr zUVrDglC2WffnGj/xy/LIHZiptUBGyngmTy3GC55C9ImD4CELmvRYkoDGk+9So0SS/1E lOOSjMM+dyss3zU0q0pjHXLAd4s1kzH64bpHVuwctkc6B73AETagWhTk3BMSRkDwDJ50 e1k2Kg6tozE5LOtQz8zGVnsZrif1TtX+sQI8ThNKzSG4/vJTP5YaVrVR2Rurv0Ba+Ltf lC9Mw3cLCCQjrl2+ffY0FfAEGIt1R0vFPmDNXPpwlP+IUSPcaP8Cr48boJ/8XL42H56Z 1qvw== X-Received: by 10.180.79.168 with SMTP id k8mr69579219wix.35.1404639421387; Sun, 06 Jul 2014 02:37:01 -0700 (PDT) Received: from localhost.localdomain (109-186-76-70.bb.netvision.net.il. [109.186.76.70]) by mx.google.com with ESMTPSA id 20sm79585207wjt.42.2014.07.06.02.37.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 06 Jul 2014 02:37:00 -0700 (PDT) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Johannes Berg , Emmanuel Grumbach Subject: [PATCH 26/40] iwlwifi: mvm: validate that we don't send zero quota Date: Sun, 6 Jul 2014 12:36:02 +0300 Message-Id: <1404639376-3792-26-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <53B917DC.5050902@gmail.com> References: <53B917DC.5050902@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=-7.4 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 The firmware currently deals with zero quota for a given binding, but it seems odd to send that down. Make sure that we don't do that. Signed-off-by: Johannes Berg Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/quota.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/wireless/iwlwifi/mvm/quota.c b/drivers/net/wireless/iwlwifi/mvm/quota.c index 8bb2fce..3f18786 100644 --- a/drivers/net/wireless/iwlwifi/mvm/quota.c +++ b/drivers/net/wireless/iwlwifi/mvm/quota.c @@ -297,6 +297,14 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm, struct ieee80211_vif *vif, iwl_mvm_adjust_quota_for_noa(mvm, &cmd); + /* check that we have non-zero quota for all valid bindings */ + for (i = 0; i < MAX_BINDINGS; i++) { + if (cmd.quotas[i].id_and_color == cpu_to_le32(FW_CTXT_INVALID)) + continue; + WARN_ONCE(cmd.quotas[i].quota == 0, + "zero quota on binding %d\n", i); + } + ret = iwl_mvm_send_cmd_pdu(mvm, TIME_QUOTA_CMD, 0, sizeof(cmd), &cmd); if (ret)