madwifi: add sanity checks for monitor mode injection
SVN-Revision: 16218
This commit is contained in:
parent
f48e0b1e5f
commit
ffea0b1aee
|
@ -0,0 +1,26 @@
|
|||
--- a/ath/if_ath.c
|
||||
+++ b/ath/if_ath.c
|
||||
@@ -3199,7 +3199,13 @@ ath_tx_startraw(struct net_device *dev,
|
||||
struct ieee80211_frame *wh;
|
||||
|
||||
wh = (struct ieee80211_frame *)skb->data;
|
||||
+
|
||||
try0 = ph->try0;
|
||||
+ if (!try0)
|
||||
+ try0 = 1;
|
||||
+ else if (try0 > 11)
|
||||
+ try0 = 11;
|
||||
+
|
||||
rt = sc->sc_currates;
|
||||
txrate = dot11_to_ratecode(sc, rt, ph->rate0);
|
||||
power = ph->power > 63 ? 63 : ph->power;
|
||||
@@ -3224,7 +3230,8 @@ ath_tx_startraw(struct net_device *dev,
|
||||
rt = sc->sc_currates;
|
||||
KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
|
||||
|
||||
- if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
|
||||
+ if (((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_DATA) ||
|
||||
+ IEEE80211_IS_MULTICAST(wh->i_addr1)) {
|
||||
flags |= HAL_TXDESC_NOACK; /* no ack on broad/multicast */
|
||||
sc->sc_stats.ast_tx_noack++;
|
||||
try0 = 1;
|
Loading…
Reference in New Issue