diff options
| author | John W. Linville | 2013-08-01 21:26:52 +0200 |
|---|---|---|
| committer | John W. Linville | 2013-08-01 21:26:52 +0200 |
| commit | 7546ff95499781306e8fd7d84ae38b84be961364 (patch) | |
| tree | 58416d00380ad1122acee71b594b26ab9a201e48 /drivers/net/wireless/iwlegacy | |
| parent | mwifiex: code rearrangement in sdio.c (diff) | |
| parent | mac80211: make active monitor injection work w/ HW queue (diff) | |
| download | kernel-qcow2-linux-7546ff95499781306e8fd7d84ae38b84be961364.tar.gz kernel-qcow2-linux-7546ff95499781306e8fd7d84ae38b84be961364.tar.xz kernel-qcow2-linux-7546ff95499781306e8fd7d84ae38b84be961364.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/3945-rs.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-rs.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c index fe31590a51b2..aea667b430c3 100644 --- a/drivers/net/wireless/iwlegacy/3945-rs.c +++ b/drivers/net/wireless/iwlegacy/3945-rs.c @@ -887,6 +887,7 @@ il3945_remove_debugfs(void *il, void *il_sta) */ static void il3945_rs_rate_init_stub(void *il_r, struct ieee80211_supported_band *sband, + struct cfg80211_chan_def *chandef, struct ieee80211_sta *sta, void *il_sta) { } diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c index ed3c42a63a43..3ccbaf791b48 100644 --- a/drivers/net/wireless/iwlegacy/4965-rs.c +++ b/drivers/net/wireless/iwlegacy/4965-rs.c @@ -2803,6 +2803,7 @@ il4965_rs_remove_debugfs(void *il, void *il_sta) */ static void il4965_rs_rate_init_stub(void *il_r, struct ieee80211_supported_band *sband, + struct cfg80211_chan_def *chandef, struct ieee80211_sta *sta, void *il_sta) { } |