From patchwork Sun Apr 28 07:06:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Coelho X-Patchwork-Id: 10920747 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DDF52933 for ; Sun, 28 Apr 2019 07:07:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C149F2891A for ; Sun, 28 Apr 2019 07:07:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE46E28AB7; Sun, 28 Apr 2019 07:07:06 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 4270F2891A for ; Sun, 28 Apr 2019 07:07:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726450AbfD1HGx (ORCPT ); Sun, 28 Apr 2019 03:06:53 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:51122 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726133AbfD1HGx (ORCPT ); Sun, 28 Apr 2019 03:06:53 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=redipa) by farmhouse.coelho.fi with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1hKdtj-0003va-Mn; Sun, 28 Apr 2019 10:06:51 +0300 Message-ID: Subject: pull-request: iwlwifi-fixes 2019-04-28 From: Luca Coelho To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, linuxwifi@intel.com, david.e.box@intel.com, joe.konno@intel.com Date: Sun, 28 Apr 2019 10:06:50 +0300 User-Agent: Evolution 3.30.5-1 MIME-Version: 1.0 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 Hi Kalle, This is the fourth batch of fixes for v5.1. It contains two fixes I send in the last patchset plus a patch that I sent separately to fix a merge damage caused by the previous pull. More details about the contents in the tag description. I have sent this out before and kbuildbot reported success. Please let me know if there are any issues. Cheers, Luca. The following changes since commit b82d6c1f8f8288f744a9dcc16cd3085d535decca: mwifiex: Make resume actually do something useful again on SDIO cards (2019-04-25 14:05:14 +0300) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git tags/iwlwifi-for-kalle-2019-04-28 for you to fetch changes up to d156e67d3f58c5d3c7ebe1bec80657db534f32d4: iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register() (2019-04-28 09:59:59 +0300) ---------------------------------------------------------------- Fourth batch of patches intended for v5.1 * Fix an oops when we receive a packet with bogus lengths; * Fix a bug that prevented 5350 devices from working; * Fix a small merge damage from the previous series; ---------------------------------------------------------------- Emmanuel Grumbach (1): iwlwifi: fix driver operation for 5350 Luca Coelho (2): iwlwifi: mvm: check for length correctness in iwl_mvm_create_skb() iwlwifi: mvm: fix merge damage in iwl_mvm_vif_dbgfs_register() drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 3 ++- drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 6 ------ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 28 ++++++++++++++++++++++++---- 3 files changed, 26 insertions(+), 11 deletions(-)