From 7e2d6806f3b00cea3aefaf5d8c701b7cb510e50a Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Wed, 7 Dec 2011 14:46:24 +0200 Subject: [PATCH] --- yaml --- r: 279191 b: refs/heads/master c: 23fd7b029fa58c265bfa757603fd2af27c7af3ad h: refs/heads/master i: 279189: 7ec5761351f53359676fc54f61b870a276a26c83 279187: 789def2b0a34cfb799e6eb52883389e76f58d250 279183: 146c0ed668272ccf48d6e7ebe99a4432731e3155 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-shared.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1e16283fb927..19d1736ea421 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5326db8bb058a32c22ed82a8e359a8fe6f0bf9b +refs/heads/master: 23fd7b029fa58c265bfa757603fd2af27c7af3ad diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h index aa1ed6549474..8cf877e43521 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -347,16 +347,19 @@ struct iwl_cfg { * @ucode_owner: IWL_OWNERSHIP_* * @cmd_queue: command queue number * @status: STATUS_* + * @wowlan: are we running wowlan uCode * @valid_contexts: microcode/device supports multiple contexts * @bus: pointer to the bus layer data * @cfg: see struct iwl_cfg * @priv: pointer to the upper layer data + * @trans: pointer to the transport layer data * @hw_params: see struct iwl_hw_params * @workqueue: the workqueue used by all the layers of the driver * @lock: protect general shared data * @sta_lock: protects the station table. * If lock and sta_lock are needed, lock must be acquired first. * @mutex: + * @wait_command_queue: the wait_queue for SYNC host command nad uCode load * @eeprom: pointer to the eeprom/OTP image * @ucode_type: indicator of loaded ucode image * @notif_waits: things waiting for notification