From patchwork Sun Apr 13 13:33:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eliad Peller X-Patchwork-Id: 3973951 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 15D82BFF02 for ; Sun, 13 Apr 2014 13:35:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 180402021A for ; Sun, 13 Apr 2014 13:35:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D34E920218 for ; Sun, 13 Apr 2014 13:35:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754557AbaDMNei (ORCPT ); Sun, 13 Apr 2014 09:34:38 -0400 Received: from mail-we0-f177.google.com ([74.125.82.177]:42690 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754381AbaDMNeh (ORCPT ); Sun, 13 Apr 2014 09:34:37 -0400 Received: by mail-we0-f177.google.com with SMTP id u57so7169575wes.36 for ; Sun, 13 Apr 2014 06:34:36 -0700 (PDT) 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; bh=qHVaDWQGeRga0AaR5Y1+AJuSlRVaqdAX5ZdbZEMiL8Q=; b=a++kO+QhXqnVFVmQUVQvADyhPuZHtu8dWlyA1TDjVlqrcvgNxFbedU/dphie9mPsn+ e4x53PcGZ8UZsgEqQ34Nwp895/9nR1PBaS7APEvAcBpNJjk0nlqrpw5mq9sQvEdUOx7o oaf2047DEcYVOFTU6vWUq2i2YBILT591yHWrMiB/SCZ6lsrh3y+sBRJcrbBvNqmU2rMe /+kRNyM1kLd6EtYlNnbzXOk8iVJEb6uJuZKha1VPiFVoFYL3jbyi3l4WTIvF6ME0IsKL UTbXRsFKGLfpdu6S+oFwn45VIDvLmpGT8Sck0V9SSB3p/hvNHZxpjJnTeLqC8CnBGb1q lZlQ== X-Gm-Message-State: ALoCoQmUn3BmoK9s/D/rhFXlco/tbS5pxYvtwHMC9m8mpYqQUDbsHSjEHBcJhCkuuQ/wXofusZ8i X-Received: by 10.180.85.163 with SMTP id i3mr5913954wiz.14.1397396075990; Sun, 13 Apr 2014 06:34:35 -0700 (PDT) Received: from muse.amr.corp.intel.com (93-172-30-100.bb.netvision.net.il. [93.172.30.100]) by mx.google.com with ESMTPSA id dg7sm20424444wjc.4.2014.04.13.06.34.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 13 Apr 2014 06:34:35 -0700 (PDT) From: Eliad Peller To: "John W. Linville" Cc: Subject: [PATCH] wl18xx: align event mailbox with current fw Date: Sun, 13 Apr 2014 16:33:51 +0300 Message-Id: <1397396071-7825-1-git-send-email-eliad@wizery.com> X-Mailer: git-send-email 1.8.5.2.229.g4448466.dirty 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Some fields are missing from the event mailbox struct definitions, which cause issues when trying to handle some events. Add the missing fields in order to align the struct size (without adding actual support for the new fields). Reported-and-tested-by: Imre Kaloz Cc: stable@vger.kernel.org # 3.14+ Fixes: 028e724 ("wl18xx: move to new firmware (wl18xx-fw-3.bin)") Signed-off-by: Eliad Peller --- drivers/net/wireless/ti/wl18xx/event.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/net/wireless/ti/wl18xx/event.h b/drivers/net/wireless/ti/wl18xx/event.h index 398f3d2..a76e98e 100644 --- a/drivers/net/wireless/ti/wl18xx/event.h +++ b/drivers/net/wireless/ti/wl18xx/event.h @@ -68,6 +68,26 @@ struct wl18xx_event_mailbox { /* bitmap of inactive stations (by HLID) */ __le32 inactive_sta_bitmap; + + /* rx BA win size indicated by RX_BA_WIN_SIZE_CHANGE_EVENT_ID */ + u8 rx_ba_role_id; + u8 rx_ba_link_id; + u8 rx_ba_win_size; + u8 padding; + + /* smart config */ + u8 sc_ssid_len; + u8 sc_pwd_len; + u8 sc_token_len; + u8 padding1; + u8 sc_ssid[32]; + u8 sc_pwd[32]; + u8 sc_token[32]; + + /* smart config sync channel */ + u8 sc_sync_channel; + u8 sc_sync_band; + u8 padding2[2]; } __packed; int wl18xx_wait_for_event(struct wl1271 *wl, enum wlcore_wait_event event,