aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/wfx/hif_tx.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-27 13:14:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-27 13:14:15 -0700
commit42afe7d1c6ef77212250af3459e549d1a944cc8a (patch)
tree8a711863b8ae7783d2eddb5b6c51667aedb7ee66 /drivers/staging/wfx/hif_tx.h
parentMerge tag 'usb-5.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff)
parentStaging: rtl8723bs: prevent buffer overflow in update_sta_support_rate() (diff)
downloadlinux-dev-42afe7d1c6ef77212250af3459e549d1a944cc8a.tar.xz
linux-dev-42afe7d1c6ef77212250af3459e549d1a944cc8a.zip
Merge tag 'staging-5.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH: "Here are a small number of tiny staging driver fixes for 5.8-rc3. Not much here, but there were some reported problems to be fixed: - three wfx driver fixes - rtl8723bs driver fix All of these have been in linux-next with no reported issues" * tag 'staging-5.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: Staging: rtl8723bs: prevent buffer overflow in update_sta_support_rate() staging: wfx: fix coherency of hif_scan() prototype staging: wfx: drop useless loop staging: wfx: fix AC priority
Diffstat (limited to 'drivers/staging/wfx/hif_tx.h')
-rw-r--r--drivers/staging/wfx/hif_tx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wfx/hif_tx.h b/drivers/staging/wfx/hif_tx.h
index e9eca9330178..e1da28aef706 100644
--- a/drivers/staging/wfx/hif_tx.h
+++ b/drivers/staging/wfx/hif_tx.h
@@ -42,7 +42,7 @@ int hif_read_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id,
int hif_write_mib(struct wfx_dev *wdev, int vif_id, u16 mib_id,
void *buf, size_t buf_size);
int hif_scan(struct wfx_vif *wvif, struct cfg80211_scan_request *req80211,
- int chan_start, int chan_num);
+ int chan_start, int chan_num, int *timeout);
int hif_stop_scan(struct wfx_vif *wvif);
int hif_join(struct wfx_vif *wvif, const struct ieee80211_bss_conf *conf,
struct ieee80211_channel *channel, const u8 *ssid, int ssidlen);