diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-21 01:40:35 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-21 01:40:35 +0200 |
| commit | 56025caa821d8e398b7cff2c45fb1e3e769549d7 (patch) | |
| tree | 59d35e89cf27eb60aab334c7a53cfa3e99dacda0 /drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h | |
| parent | net: cdc_ncm: update datagram size after changing mtu (diff) | |
| parent | Merge ath-next from ath.git (diff) | |
| download | linux-56025caa821d8e398b7cff2c45fb1e3e769549d7.tar.xz linux-56025caa821d8e398b7cff2c45fb1e3e769549d7.zip | |
Merge tag 'wireless-drivers-next-for-davem-2016-05-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers patches for 4.7
Major changes:
iwlwifi
* remove IWLWIFI_DEBUG_EXPERIMENTAL_UCODE kconfig option
* work for RX multiqueue continues
* dynamic queue allocation work continues
* add Luca as maintainer
* a bunch of fixes and improvements all over
brcmfmac
* add 4356 sdio support
ath6kl
* add ability to set debug uart baud rate with a module parameter
wil6210
* add debugfs file to configure firmware led functionality
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h index 24103877eab0..d34de3f71db6 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h @@ -73,8 +73,8 @@ struct iwl_phy_db *iwl_phy_db_init(struct iwl_trans *trans); void iwl_phy_db_free(struct iwl_phy_db *phy_db); -int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, struct iwl_rx_packet *pkt, - gfp_t alloc_ctx); +int iwl_phy_db_set_section(struct iwl_phy_db *phy_db, + struct iwl_rx_packet *pkt); int iwl_send_phy_db_data(struct iwl_phy_db *phy_db); |