diff options
author | John W. Linville | 2013-01-28 19:54:03 +0100 |
---|---|---|
committer | John W. Linville | 2013-01-28 19:54:03 +0100 |
commit | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 (patch) | |
tree | ed690568a27b7231b8a507e8ba07c1ae34868e5c /drivers/net/wireless/b43/b43.h | |
parent | ath9k_hw: remove a useless WARN_ON (diff) | |
parent | mwifiex: fix typo in PCIe adapter NULL check (diff) | |
download | kernel-qcow2-linux-9ebea3829fac7505e0cd2642fbd13cfa9c038831.tar.gz kernel-qcow2-linux-9ebea3829fac7505e0cd2642fbd13cfa9c038831.tar.xz kernel-qcow2-linux-9ebea3829fac7505e0cd2642fbd13cfa9c038831.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/dvm/tx.c
Diffstat (limited to 'drivers/net/wireless/b43/b43.h')
-rw-r--r-- | drivers/net/wireless/b43/b43.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index b298e5d68be2..10e288d470e7 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h @@ -7,6 +7,7 @@ #include <linux/hw_random.h> #include <linux/bcma/bcma.h> #include <linux/ssb/ssb.h> +#include <linux/completion.h> #include <net/mac80211.h> #include "debugfs.h" @@ -722,6 +723,10 @@ enum b43_firmware_file_type { struct b43_request_fw_context { /* The device we are requesting the fw for. */ struct b43_wldev *dev; + /* a completion event structure needed if this call is asynchronous */ + struct completion fw_load_complete; + /* a pointer to the firmware object */ + const struct firmware *blob; /* The type of firmware to request. */ enum b43_firmware_file_type req_type; /* Error messages for each firmware type. */ |