mirror of https://github.com/hak5/openwrt.git
madwifi: preserve the interface mode correctly when using wds with sta separation
SVN-Revision: 14195lede-17.01
parent
f561b910e8
commit
10e3ea9f12
|
@ -44,12 +44,13 @@
|
||||||
|
|
||||||
if (ic->ic_dev->flags & IFF_RUNNING) {
|
if (ic->ic_dev->flags & IFF_RUNNING) {
|
||||||
/* needs to disable hardware too */
|
/* needs to disable hardware too */
|
||||||
@@ -1271,8 +1269,11 @@ ath_vap_create(struct ieee80211com *ic,
|
@@ -1271,8 +1269,12 @@ ath_vap_create(struct ieee80211com *ic,
|
||||||
} else
|
} else
|
||||||
ic_opmode = opmode;
|
ic_opmode = opmode;
|
||||||
break;
|
break;
|
||||||
- case IEEE80211_M_HOSTAP:
|
- case IEEE80211_M_HOSTAP:
|
||||||
case IEEE80211_M_WDS:
|
case IEEE80211_M_WDS:
|
||||||
|
+ ic_opmode = ic->ic_opmode;
|
||||||
+ if (!master)
|
+ if (!master)
|
||||||
+ return NULL;
|
+ return NULL;
|
||||||
+ break;
|
+ break;
|
||||||
|
@ -57,7 +58,7 @@
|
||||||
/* permit multiple APs and/or WDS links */
|
/* permit multiple APs and/or WDS links */
|
||||||
/* XXX sta+ap for repeater/bridge application */
|
/* XXX sta+ap for repeater/bridge application */
|
||||||
if ((sc->sc_nvaps != 0) && (ic->ic_opmode == IEEE80211_M_STA))
|
if ((sc->sc_nvaps != 0) && (ic->ic_opmode == IEEE80211_M_STA))
|
||||||
@@ -1304,7 +1305,7 @@ ath_vap_create(struct ieee80211com *ic,
|
@@ -1304,7 +1306,7 @@ ath_vap_create(struct ieee80211com *ic,
|
||||||
}
|
}
|
||||||
|
|
||||||
avp = dev->priv;
|
avp = dev->priv;
|
||||||
|
@ -66,7 +67,7 @@
|
||||||
/* override with driver methods */
|
/* override with driver methods */
|
||||||
vap = &avp->av_vap;
|
vap = &avp->av_vap;
|
||||||
avp->av_newstate = vap->iv_newstate;
|
avp->av_newstate = vap->iv_newstate;
|
||||||
@@ -4209,8 +4210,7 @@ ath_calcrxfilter(struct ath_softc *sc)
|
@@ -4209,8 +4211,7 @@ ath_calcrxfilter(struct ath_softc *sc)
|
||||||
if (ic->ic_opmode == IEEE80211_M_STA ||
|
if (ic->ic_opmode == IEEE80211_M_STA ||
|
||||||
sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */
|
sc->sc_opmode == HAL_M_IBSS || /* NB: AHDEMO too */
|
||||||
(sc->sc_nostabeacons) || sc->sc_scanning ||
|
(sc->sc_nostabeacons) || sc->sc_scanning ||
|
||||||
|
@ -76,7 +77,7 @@
|
||||||
rfilt |= HAL_RX_FILTER_BEACON;
|
rfilt |= HAL_RX_FILTER_BEACON;
|
||||||
if (sc->sc_nmonvaps > 0)
|
if (sc->sc_nmonvaps > 0)
|
||||||
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
|
rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
|
||||||
@@ -9030,8 +9030,6 @@ ath_calibrate(unsigned long arg)
|
@@ -9030,8 +9031,6 @@ ath_calibrate(unsigned long arg)
|
||||||
* set sc->beacons if we might need to restart
|
* set sc->beacons if we might need to restart
|
||||||
* them after ath_reset. */
|
* them after ath_reset. */
|
||||||
if (!sc->sc_beacons &&
|
if (!sc->sc_beacons &&
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/ath/if_ath.c
|
--- a/ath/if_ath.c
|
||||||
+++ b/ath/if_ath.c
|
+++ b/ath/if_ath.c
|
||||||
@@ -5483,6 +5483,9 @@ ath_beacon_config(struct ath_softc *sc,
|
@@ -5484,6 +5484,9 @@ ath_beacon_config(struct ath_softc *sc,
|
||||||
ath_beacon_dturbo_config(vap, intval &
|
ath_beacon_dturbo_config(vap, intval &
|
||||||
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
|
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
static int ath_desc_alloc(struct ath_softc *);
|
static int ath_desc_alloc(struct ath_softc *);
|
||||||
static void ath_desc_free(struct ath_softc *);
|
static void ath_desc_free(struct ath_softc *);
|
||||||
static void ath_desc_swap(struct ath_desc *);
|
static void ath_desc_swap(struct ath_desc *);
|
||||||
@@ -2792,6 +2793,72 @@ ath_set_ack_bitrate(struct ath_softc *sc
|
@@ -2793,6 +2794,72 @@ ath_set_ack_bitrate(struct ath_softc *sc
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@
|
||||||
/*
|
/*
|
||||||
* Reset the hardware w/o losing operational state. This is
|
* Reset the hardware w/o losing operational state. This is
|
||||||
* basically a more efficient way of doing ath_stop, ath_init,
|
* basically a more efficient way of doing ath_stop, ath_init,
|
||||||
@@ -5291,6 +5358,7 @@ ath_beacon_config(struct ath_softc *sc,
|
@@ -5292,6 +5359,7 @@ ath_beacon_config(struct ath_softc *sc,
|
||||||
u_int64_t tsf, hw_tsf;
|
u_int64_t tsf, hw_tsf;
|
||||||
u_int32_t tsftu, hw_tsftu;
|
u_int32_t tsftu, hw_tsftu;
|
||||||
u_int32_t intval, nexttbtt = 0;
|
u_int32_t intval, nexttbtt = 0;
|
||||||
|
@ -89,7 +89,7 @@
|
||||||
int reset_tsf = 0;
|
int reset_tsf = 0;
|
||||||
|
|
||||||
if (vap == NULL)
|
if (vap == NULL)
|
||||||
@@ -5298,6 +5366,9 @@ ath_beacon_config(struct ath_softc *sc,
|
@@ -5299,6 +5367,9 @@ ath_beacon_config(struct ath_softc *sc,
|
||||||
|
|
||||||
ni = vap->iv_bss;
|
ni = vap->iv_bss;
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@
|
||||||
hw_tsf = ath_hal_gettsf64(ah);
|
hw_tsf = ath_hal_gettsf64(ah);
|
||||||
tsf = le64_to_cpu(ni->ni_tstamp.tsf);
|
tsf = le64_to_cpu(ni->ni_tstamp.tsf);
|
||||||
hw_tsftu = hw_tsf >> 10;
|
hw_tsftu = hw_tsf >> 10;
|
||||||
@@ -5487,15 +5558,27 @@ ath_beacon_config(struct ath_softc *sc,
|
@@ -5488,15 +5559,27 @@ ath_beacon_config(struct ath_softc *sc,
|
||||||
<= ath_hal_sw_beacon_response_time)
|
<= ath_hal_sw_beacon_response_time)
|
||||||
nexttbtt += intval;
|
nexttbtt += intval;
|
||||||
sc->sc_nexttbtt = nexttbtt;
|
sc->sc_nexttbtt = nexttbtt;
|
||||||
|
@ -127,7 +127,7 @@
|
||||||
/* We print all debug messages here, in order to preserve the
|
/* We print all debug messages here, in order to preserve the
|
||||||
* time critical aspect of this function */
|
* time critical aspect of this function */
|
||||||
DPRINTF(sc, ATH_DEBUG_BEACON,
|
DPRINTF(sc, ATH_DEBUG_BEACON,
|
||||||
@@ -6398,6 +6481,11 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
@@ -6399,6 +6482,11 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
||||||
DPRINTF(sc, ATH_DEBUG_BEACON,
|
DPRINTF(sc, ATH_DEBUG_BEACON,
|
||||||
"Updated beacon timers\n");
|
"Updated beacon timers\n");
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
break;
|
break;
|
||||||
case IEEE80211_M_AHDEMO:
|
case IEEE80211_M_AHDEMO:
|
||||||
case IEEE80211_M_MONITOR:
|
case IEEE80211_M_MONITOR:
|
||||||
@@ -1454,7 +1457,7 @@ ath_vap_create(struct ieee80211com *ic,
|
@@ -1455,7 +1458,7 @@ ath_vap_create(struct ieee80211com *ic,
|
||||||
* frames. Other modes carry over directly to the HAL.
|
* frames. Other modes carry over directly to the HAL.
|
||||||
*/
|
*/
|
||||||
if (ic->ic_opmode == IEEE80211_M_AHDEMO)
|
if (ic->ic_opmode == IEEE80211_M_AHDEMO)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/ath/if_ath.c
|
--- a/ath/if_ath.c
|
||||||
+++ b/ath/if_ath.c
|
+++ b/ath/if_ath.c
|
||||||
@@ -1451,6 +1451,23 @@ ath_vap_create(struct ieee80211com *ic,
|
@@ -1452,6 +1452,23 @@ ath_vap_create(struct ieee80211com *ic,
|
||||||
sc->sc_nstavaps++;
|
sc->sc_nstavaps++;
|
||||||
else if (opmode == IEEE80211_M_MONITOR)
|
else if (opmode == IEEE80211_M_MONITOR)
|
||||||
sc->sc_nmonvaps++;
|
sc->sc_nmonvaps++;
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
/*
|
/*
|
||||||
* Adhoc demo mode is a pseudo mode; to the HAL it's
|
* Adhoc demo mode is a pseudo mode; to the HAL it's
|
||||||
* just IBSS mode and the driver doesn't use management
|
* just IBSS mode and the driver doesn't use management
|
||||||
@@ -4278,7 +4295,8 @@ ath_calcrxfilter(struct ath_softc *sc)
|
@@ -4279,7 +4296,8 @@ ath_calcrxfilter(struct ath_softc *sc)
|
||||||
if (ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC))
|
if (ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC))
|
||||||
rfilt |= HAL_RX_FILTER_PROM;
|
rfilt |= HAL_RX_FILTER_PROM;
|
||||||
if (ic->ic_opmode == IEEE80211_M_STA ||
|
if (ic->ic_opmode == IEEE80211_M_STA ||
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
(sc->sc_nostabeacons) || sc->sc_scanning ||
|
(sc->sc_nostabeacons) || sc->sc_scanning ||
|
||||||
(ic->ic_opmode == IEEE80211_M_HOSTAP))
|
(ic->ic_opmode == IEEE80211_M_HOSTAP))
|
||||||
rfilt |= HAL_RX_FILTER_BEACON;
|
rfilt |= HAL_RX_FILTER_BEACON;
|
||||||
@@ -6432,6 +6450,33 @@ ath_capture(struct net_device *dev, cons
|
@@ -6433,6 +6451,33 @@ ath_capture(struct net_device *dev, cons
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
* Intercept management frames to collect beacon RSSI data and to do
|
* Intercept management frames to collect beacon RSSI data and to do
|
||||||
* ibss merges. This function is called for all management frames,
|
* ibss merges. This function is called for all management frames,
|
||||||
* including those belonging to other BSS.
|
* including those belonging to other BSS.
|
||||||
@@ -6484,10 +6529,19 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
@@ -6485,10 +6530,19 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
||||||
DPRINTF(sc, ATH_DEBUG_BEACON,
|
DPRINTF(sc, ATH_DEBUG_BEACON,
|
||||||
"Updated beacon timers\n");
|
"Updated beacon timers\n");
|
||||||
}
|
}
|
||||||
|
@ -92,7 +92,7 @@
|
||||||
}
|
}
|
||||||
/* NB: Fall Through */
|
/* NB: Fall Through */
|
||||||
case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
|
case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
|
||||||
@@ -6560,6 +6614,10 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
@@ -6561,6 +6615,10 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
||||||
#endif
|
#endif
|
||||||
if (do_merge)
|
if (do_merge)
|
||||||
ieee80211_ibss_merge(ni);
|
ieee80211_ibss_merge(ni);
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
/* Allocate space for dynamically determined maximum VAP count */
|
/* Allocate space for dynamically determined maximum VAP count */
|
||||||
sc->sc_bslot =
|
sc->sc_bslot =
|
||||||
kmalloc(ath_maxvaps * sizeof(struct ieee80211vap*), GFP_KERNEL);
|
kmalloc(ath_maxvaps * sizeof(struct ieee80211vap*), GFP_KERNEL);
|
||||||
@@ -1507,6 +1519,28 @@ ath_vap_create(struct ieee80211com *ic,
|
@@ -1508,6 +1520,28 @@ ath_vap_create(struct ieee80211com *ic,
|
||||||
return vap;
|
return vap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@
|
||||||
static void
|
static void
|
||||||
ath_vap_delete(struct ieee80211vap *vap)
|
ath_vap_delete(struct ieee80211vap *vap)
|
||||||
{
|
{
|
||||||
@@ -10818,6 +10852,12 @@ ath_ioctl(struct net_device *dev, struct
|
@@ -10819,6 +10853,12 @@ ath_ioctl(struct net_device *dev, struct
|
||||||
* is to add module parameters.
|
* is to add module parameters.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@
|
||||||
/*
|
/*
|
||||||
* Dynamic (i.e. per-device) sysctls. These are automatically
|
* Dynamic (i.e. per-device) sysctls. These are automatically
|
||||||
* mirrored in /proc/sys.
|
* mirrored in /proc/sys.
|
||||||
@@ -10897,6 +10937,38 @@ ath_sysctl_get_intmit(struct ath_softc *
|
@@ -10898,6 +10938,38 @@ ath_sysctl_get_intmit(struct ath_softc *
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
@ -114,7 +114,7 @@
|
||||||
ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
|
ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
|
||||||
{
|
{
|
||||||
struct ath_softc *sc = ctl->extra1;
|
struct ath_softc *sc = ctl->extra1;
|
||||||
@@ -11176,6 +11248,24 @@ static int maxint = 0x7fffffff; /* 32-b
|
@@ -11177,6 +11249,24 @@ static int maxint = 0x7fffffff; /* 32-b
|
||||||
|
|
||||||
static const ctl_table ath_sysctl_template[] = {
|
static const ctl_table ath_sysctl_template[] = {
|
||||||
{ .ctl_name = CTL_AUTO,
|
{ .ctl_name = CTL_AUTO,
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/ath/if_ath.c
|
--- a/ath/if_ath.c
|
||||||
+++ b/ath/if_ath.c
|
+++ b/ath/if_ath.c
|
||||||
@@ -6665,6 +6665,7 @@ ath_setdefantenna(struct ath_softc *sc,
|
@@ -6666,6 +6666,7 @@ ath_setdefantenna(struct ath_softc *sc,
|
||||||
struct ath_hal *ah = sc->sc_ah;
|
struct ath_hal *ah = sc->sc_ah;
|
||||||
|
|
||||||
/* XXX block beacon interrupts */
|
/* XXX block beacon interrupts */
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
/* calibrate every 30 secs in steady state but check every second at first. */
|
/* calibrate every 30 secs in steady state but check every second at first. */
|
||||||
static int ath_calinterval = ATH_SHORT_CALINTERVAL;
|
static int ath_calinterval = ATH_SHORT_CALINTERVAL;
|
||||||
@@ -2579,6 +2580,7 @@ ath_init(struct net_device *dev)
|
@@ -2580,6 +2581,7 @@ ath_init(struct net_device *dev)
|
||||||
* be followed by initialization of the appropriate bits
|
* be followed by initialization of the appropriate bits
|
||||||
* and then setup of the interrupt mask.
|
* and then setup of the interrupt mask.
|
||||||
*/
|
*/
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
sc->sc_curchan.channel = ic->ic_curchan->ic_freq;
|
sc->sc_curchan.channel = ic->ic_curchan->ic_freq;
|
||||||
sc->sc_curchan.channelFlags = ath_chan2flags(ic->ic_curchan);
|
sc->sc_curchan.channelFlags = ath_chan2flags(ic->ic_curchan);
|
||||||
if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) {
|
if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) {
|
||||||
@@ -2913,6 +2915,40 @@ ath_hw_check_atim(struct ath_softc *sc,
|
@@ -2914,6 +2916,40 @@ ath_hw_check_atim(struct ath_softc *sc,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
/*
|
/*
|
||||||
* Reset the hardware w/o losing operational state. This is
|
* Reset the hardware w/o losing operational state. This is
|
||||||
* basically a more efficient way of doing ath_stop, ath_init,
|
* basically a more efficient way of doing ath_stop, ath_init,
|
||||||
@@ -2939,6 +2975,7 @@ ath_reset(struct net_device *dev)
|
@@ -2940,6 +2976,7 @@ ath_reset(struct net_device *dev)
|
||||||
* Convert to a HAL channel description with the flags
|
* Convert to a HAL channel description with the flags
|
||||||
* constrained to reflect the current operating mode.
|
* constrained to reflect the current operating mode.
|
||||||
*/
|
*/
|
||||||
|
@ -65,7 +65,7 @@
|
||||||
c = ic->ic_curchan;
|
c = ic->ic_curchan;
|
||||||
sc->sc_curchan.channel = c->ic_freq;
|
sc->sc_curchan.channel = c->ic_freq;
|
||||||
sc->sc_curchan.channelFlags = ath_chan2flags(c);
|
sc->sc_curchan.channelFlags = ath_chan2flags(c);
|
||||||
@@ -9019,6 +9056,7 @@ ath_chan_set(struct ath_softc *sc, struc
|
@@ -9020,6 +9057,7 @@ ath_chan_set(struct ath_softc *sc, struc
|
||||||
u_int8_t channel_change_required = 0;
|
u_int8_t channel_change_required = 0;
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/net80211/ieee80211_input.c
|
--- a/net80211/ieee80211_input.c
|
||||||
+++ b/net80211/ieee80211_input.c
|
+++ b/net80211/ieee80211_input.c
|
||||||
@@ -1374,7 +1386,7 @@ ieee80211_auth_open(struct ieee80211_nod
|
@@ -1374,7 +1374,7 @@ ieee80211_auth_open(struct ieee80211_nod
|
||||||
vap->iv_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */
|
vap->iv_stats.is_rx_bad_auth++; /* XXX maybe a unique error? */
|
||||||
if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
|
if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
|
||||||
if (ni == vap->iv_bss) {
|
if (ni == vap->iv_bss) {
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
if (ni == NULL)
|
if (ni == NULL)
|
||||||
return;
|
return;
|
||||||
tmpnode = 1;
|
tmpnode = 1;
|
||||||
@@ -1762,6 +1774,8 @@ ieee80211_ssid_mismatch(struct ieee80211
|
@@ -1762,6 +1762,8 @@ ieee80211_ssid_mismatch(struct ieee80211
|
||||||
}
|
}
|
||||||
|
|
||||||
#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \
|
#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
if ((_ssid)[1] != 0 && \
|
if ((_ssid)[1] != 0 && \
|
||||||
((_ssid)[1] != (_ni)->ni_esslen || \
|
((_ssid)[1] != (_ni)->ni_esslen || \
|
||||||
memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) { \
|
memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) { \
|
||||||
@@ -1776,6 +1790,8 @@ ieee80211_ssid_mismatch(struct ieee80211
|
@@ -1776,6 +1778,8 @@ ieee80211_ssid_mismatch(struct ieee80211
|
||||||
} while (0)
|
} while (0)
|
||||||
#else /* !IEEE80211_DEBUG */
|
#else /* !IEEE80211_DEBUG */
|
||||||
#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \
|
#define IEEE80211_VERIFY_SSID(_ni, _ssid) do { \
|
||||||
|
|
|
@ -315,7 +315,7 @@
|
||||||
|
|
||||||
--- a/ath/if_ath.c
|
--- a/ath/if_ath.c
|
||||||
+++ b/ath/if_ath.c
|
+++ b/ath/if_ath.c
|
||||||
@@ -6577,9 +6577,8 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
@@ -6578,9 +6578,8 @@ ath_recv_mgmt(struct ieee80211vap * vap,
|
||||||
|
|
||||||
sc->sc_recv_mgmt(vap, ni_or_null, skb, subtype, rssi, rtsf);
|
sc->sc_recv_mgmt(vap, ni_or_null, skb, subtype, rssi, rtsf);
|
||||||
|
|
||||||
|
@ -326,7 +326,7 @@
|
||||||
(const struct ieee80211_frame_min *)skb->data);
|
(const struct ieee80211_frame_min *)skb->data);
|
||||||
if (ni == NULL) {
|
if (ni == NULL) {
|
||||||
DPRINTF(sc, ATH_DEBUG_BEACON, "Dropping; node unknown.\n");
|
DPRINTF(sc, ATH_DEBUG_BEACON, "Dropping; node unknown.\n");
|
||||||
@@ -6734,7 +6733,9 @@ ath_rx_poll(struct net_device *dev, int
|
@@ -6735,7 +6734,9 @@ ath_rx_poll(struct net_device *dev, int
|
||||||
struct ath_desc *ds;
|
struct ath_desc *ds;
|
||||||
struct ath_rx_status *rs;
|
struct ath_rx_status *rs;
|
||||||
struct sk_buff *skb = NULL;
|
struct sk_buff *skb = NULL;
|
||||||
|
@ -336,7 +336,7 @@
|
||||||
unsigned int len;
|
unsigned int len;
|
||||||
int type;
|
int type;
|
||||||
u_int phyerr;
|
u_int phyerr;
|
||||||
@@ -6889,12 +6890,15 @@ rx_accept:
|
@@ -6890,12 +6891,15 @@ rx_accept:
|
||||||
skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
|
skb_trim(skb, skb->len - IEEE80211_CRC_LEN);
|
||||||
|
|
||||||
if (mic_fail) {
|
if (mic_fail) {
|
||||||
|
@ -354,7 +354,7 @@
|
||||||
|
|
||||||
if (ni && ni->ni_table) {
|
if (ni && ni->ni_table) {
|
||||||
ieee80211_check_mic(ni, skb);
|
ieee80211_check_mic(ni, skb);
|
||||||
@@ -6956,11 +6960,24 @@ drop_micfail:
|
@@ -6957,11 +6961,24 @@ drop_micfail:
|
||||||
* for its use. If the sender is unknown spam the
|
* for its use. If the sender is unknown spam the
|
||||||
* frame; it'll be dropped where it's not wanted.
|
* frame; it'll be dropped where it's not wanted.
|
||||||
*/
|
*/
|
||||||
|
@ -381,7 +381,7 @@
|
||||||
ATH_RSSI_LPF(ATH_NODE(ni)->an_avgrssi, rs->rs_rssi);
|
ATH_RSSI_LPF(ATH_NODE(ni)->an_avgrssi, rs->rs_rssi);
|
||||||
type = ieee80211_input(ni->ni_vap, ni, skb, rs->rs_rssi, bf->bf_tsf);
|
type = ieee80211_input(ni->ni_vap, ni, skb, rs->rs_rssi, bf->bf_tsf);
|
||||||
ieee80211_unref_node(&ni);
|
ieee80211_unref_node(&ni);
|
||||||
@@ -6969,24 +6986,35 @@ drop_micfail:
|
@@ -6970,24 +6987,35 @@ drop_micfail:
|
||||||
* No key index or no entry, do a lookup and
|
* No key index or no entry, do a lookup and
|
||||||
* add the node to the mapping table if possible.
|
* add the node to the mapping table if possible.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/ath/if_ath.c
|
--- a/ath/if_ath.c
|
||||||
+++ b/ath/if_ath.c
|
+++ b/ath/if_ath.c
|
||||||
@@ -13508,7 +13508,7 @@ cleanup_ath_buf(struct ath_softc *sc, st
|
@@ -13509,7 +13509,7 @@ cleanup_ath_buf(struct ath_softc *sc, st
|
||||||
bus_unmap_single(
|
bus_unmap_single(
|
||||||
sc->sc_bdev,
|
sc->sc_bdev,
|
||||||
bf->bf_skbaddrff[i],
|
bf->bf_skbaddrff[i],
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/ath/if_ath.c
|
--- a/ath/if_ath.c
|
||||||
+++ b/ath/if_ath.c
|
+++ b/ath/if_ath.c
|
||||||
@@ -6510,7 +6510,7 @@ ath_capture(struct net_device *dev, cons
|
@@ -6511,7 +6511,7 @@ ath_capture(struct net_device *dev, cons
|
||||||
|
|
||||||
/* Never copy the SKB, as it is ours on the RX side, and this is the
|
/* Never copy the SKB, as it is ours on the RX side, and this is the
|
||||||
* last process on the TX side and we only modify our own headers. */
|
* last process on the TX side and we only modify our own headers. */
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
if (tskb == NULL) {
|
if (tskb == NULL) {
|
||||||
DPRINTF(sc, ATH_DEBUG_ANY,
|
DPRINTF(sc, ATH_DEBUG_ANY,
|
||||||
"Dropping; ath_skb_removepad failed!\n");
|
"Dropping; ath_skb_removepad failed!\n");
|
||||||
@@ -6518,6 +6518,8 @@ ath_capture(struct net_device *dev, cons
|
@@ -6519,6 +6519,8 @@ ath_capture(struct net_device *dev, cons
|
||||||
}
|
}
|
||||||
|
|
||||||
ieee80211_input_monitor(ic, tskb, bf, tx, tsf, sc);
|
ieee80211_input_monitor(ic, tskb, bf, tx, tsf, sc);
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
Please let us know if you think your name should be mentioned here!
|
Please let us know if you think your name should be mentioned here!
|
||||||
--- a/ath/if_ath.c
|
--- a/ath/if_ath.c
|
||||||
+++ b/ath/if_ath.c
|
+++ b/ath/if_ath.c
|
||||||
@@ -3129,7 +3129,7 @@ ath_tx_startraw(struct net_device *dev,
|
@@ -3130,7 +3130,7 @@ ath_tx_startraw(struct net_device *dev,
|
||||||
struct ath_softc *sc = dev->priv;
|
struct ath_softc *sc = dev->priv;
|
||||||
struct ath_hal *ah = sc->sc_ah;
|
struct ath_hal *ah = sc->sc_ah;
|
||||||
struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *)
|
struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *)
|
||||||
|
|
|
@ -108,7 +108,7 @@
|
||||||
/*
|
/*
|
||||||
* Check if the MAC has multi-rate retry support.
|
* Check if the MAC has multi-rate retry support.
|
||||||
* We do this by trying to setup a fake extended
|
* We do this by trying to setup a fake extended
|
||||||
@@ -7552,7 +7560,7 @@ ath_txq_setup(struct ath_softc *sc, int
|
@@ -7553,7 +7561,7 @@ ath_txq_setup(struct ath_softc *sc, int
|
||||||
if (qtype == HAL_TX_QUEUE_UAPSD)
|
if (qtype == HAL_TX_QUEUE_UAPSD)
|
||||||
qi.tqi_qflags = HAL_TXQ_TXDESCINT_ENABLE;
|
qi.tqi_qflags = HAL_TXQ_TXDESCINT_ENABLE;
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue