Skip to content

Commit 6660fe2

Browse files
authored
Merge pull request #8 from demirten/linux-4.12-support
Kernel 4.12+ compile fix
2 parents 9d27fae + c810cfd commit 6660fe2

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

rx.c

+4
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,11 @@ void xradio_rx_cb(struct xradio_vif *priv,
202202
#endif
203203

204204
if (arg->rxedRate >= 14) {
205+
#ifdef RX_ENC_FLAG_STBC_SHIFT
206+
hdr->flag |= RX_ENC_HT;
207+
#else
205208
hdr->flag |= RX_FLAG_HT;
209+
#endif
206210
hdr->rate_idx = arg->rxedRate - 14;
207211
} else if (arg->rxedRate >= 4) {
208212
if (hdr->band == NL80211_BAND_5GHZ)

sdio.c

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <asm/mach-types.h>
1717
#include <linux/of.h>
1818
#include <linux/of_irq.h>
19+
#include <linux/module.h>
1920

2021
#include "xradio.h"
2122
#include "sdio.h"

sta.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@ void xradio_event_handler(struct work_struct *work)
10861086
NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW :
10871087
NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH;
10881088
sta_printk(XRADIO_DBG_NIY, "[CQM] RSSI event: %d", rcpiRssi);
1089-
ieee80211_cqm_rssi_notify(priv->vif, cqm_evt,
1089+
ieee80211_cqm_rssi_notify(priv->vif, cqm_evt, rcpiRssi,
10901090
GFP_KERNEL);
10911091
break;
10921092
}

0 commit comments

Comments
 (0)