| 1 |
diff -dru madwifi-ng/ath/if_ath.c madwifi-ng-fixed/ath/if_ath.c |
| 2 |
--- madwifi-ng/ath/if_ath.c 2009-07-10 01:46:48.000000000 +0200 |
| 3 |
+++ madwifi-ng-fixed/ath/if_ath.c 2009-07-10 01:59:58.000000000 +0200 |
| 4 |
@@ -3010,6 +3010,7 @@ |
| 5 |
ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) |
| 6 |
{ |
| 7 |
struct ath_softc *sc = netdev_priv(dev); |
| 8 |
+ struct ieee80211com *ic = &sc->sc_ic; |
| 9 |
struct ath_hal *ah = sc->sc_ah; |
| 10 |
struct ieee80211_phy_params *ph = &(SKB_CB(skb)->phy); |
| 11 |
const HAL_RATE_TABLE *rt; |
| 12 |
@@ -3022,7 +3023,7 @@ |
| 13 |
struct ieee80211_frame *wh; |
| 14 |
|
| 15 |
wh = (struct ieee80211_frame *)skb->data; |
| 16 |
- try0 = ph->try[0]; |
| 17 |
+ try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try[0]; |
| 18 |
rt = sc->sc_currates; |
| 19 |
txrate = dot11_to_ratecode(sc, rt, ph->rate[0]); |
| 20 |
power = ph->power > 60 ? 60 : ph->power; |
| 21 |
@@ -3046,7 +3047,8 @@ |
| 22 |
rt = sc->sc_currates; |
| 23 |
KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); |
| 24 |
|
| 25 |
- if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { |
| 26 |
+ if (IEEE80211_IS_MULTICAST(wh->i_addr1) || ((ic->ic_opmode == |
| 27 |
+IEEE80211_M_MONITOR) && (skb->data[1]&3) != 0x01) ) { |
| 28 |
flags |= HAL_TXDESC_NOACK; /* no ack on broad/multicast */ |
| 29 |
sc->sc_stats.ast_tx_noack++; |
| 30 |
try0 = 1; |
| 31 |
Only in madwifi-ng-fixed/ath: if_ath.c.orig |
| 32 |
diff -dru madwifi-ng/ath_hal/ar5211/ar5211_reset.c madwifi-ng-fixed/ath_hal/ar5211/ar5211_reset.c |
| 33 |
--- madwifi-ng/ath_hal/ar5211/ar5211_reset.c 2009-07-10 01:46:38.000000000 +0200 |
| 34 |
+++ madwifi-ng-fixed/ath_hal/ar5211/ar5211_reset.c 2009-07-10 01:52:18.000000000 +0200 |
| 35 |
@@ -987,7 +987,7 @@ |
| 36 |
if (AH_PRIVATE(ah)->ah_macVersion < AR_SREV_VERSION_OAHU && |
| 37 |
ath_hal_getnfcheckrequired(ah, (HAL_CHANNEL *) chan)) { |
| 38 |
static const uint8_t runtime[3] = { 0, 2, 7 }; |
| 39 |
- int16_t nf, nfThresh; |
| 40 |
+ int16_t nf, nfThresh = 0; |
| 41 |
int i; |
| 42 |
|
| 43 |
if (!getNoiseFloorThresh(ah, chan, &nfThresh)) |
| 44 |
diff -dru madwifi-ng/ath_hal/ar5212/ar5212_reset.c madwifi-ng-fixed/ath_hal/ar5212/ar5212_reset.c |
| 45 |
--- madwifi-ng/ath_hal/ar5212/ar5212_reset.c 2009-07-10 01:46:41.000000000 +0200 |
| 46 |
+++ madwifi-ng-fixed/ath_hal/ar5212/ar5212_reset.c 2009-07-10 01:53:24.000000000 +0200 |
| 47 |
@@ -1264,7 +1264,7 @@ |
| 48 |
{ |
| 49 |
struct ath_hal_5212 *ahp = AH5212(ah); |
| 50 |
struct ar5212NfCalHist *h = &ahp->ah_nfCalHist; |
| 51 |
- int16_t nf, nfThresh; |
| 52 |
+ int16_t nf, nfThresh = 0; |
| 53 |
int32_t val; |
| 54 |
|
| 55 |
if (OS_REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF) { |
| 56 |
diff -dru madwifi-ng/net80211/ieee80211_scan_sta.c madwifi-ng-fixed/net80211/ieee80211_scan_sta.c |
| 57 |
--- madwifi-ng/net80211/ieee80211_scan_sta.c 2009-07-10 01:46:32.000000000 +0200 |
| 58 |
+++ madwifi-ng-fixed/net80211/ieee80211_scan_sta.c 2009-07-10 01:56:57.000000000 +0200 |
| 59 |
@@ -357,7 +357,7 @@ |
| 60 |
struct ieee80211_scan_state *ss, |
| 61 |
enum ieee80211_phymode mode, const u_int16_t freq[], int nfreq) |
| 62 |
{ |
| 63 |
- struct ieee80211_channel *c, *cg; |
| 64 |
+ struct ieee80211_channel *c, *cg = NULL; |
| 65 |
u_int modeflags; |
| 66 |
int i; |
| 67 |
|
| 68 |
@@ -1293,7 +1293,7 @@ |
| 69 |
u_int32_t flags) |
| 70 |
{ |
| 71 |
struct sta_table *st = ss->ss_priv; |
| 72 |
- struct sta_entry *selbs; |
| 73 |
+ struct sta_entry *selbs = NULL; |
| 74 |
struct ieee80211_channel *chan; |
| 75 |
|
| 76 |
KASSERT(vap->iv_opmode == IEEE80211_M_IBSS || |
| 77 |
diff -dru madwifi-ng/net80211/ieee80211_skb.c madwifi-ng-fixed/net80211/ieee80211_skb.c |
| 78 |
--- madwifi-ng/net80211/ieee80211_skb.c 2009-07-10 01:46:32.000000000 +0200 |
| 79 |
+++ madwifi-ng-fixed/net80211/ieee80211_skb.c 2009-07-10 01:54:54.000000000 +0200 |
| 80 |
@@ -464,7 +464,7 @@ |
| 81 |
* - Break the linked list, clearing next skb's prev pointer if possible. */ |
| 82 |
void ieee80211_dev_kfree_skb(struct sk_buff **pskb) |
| 83 |
{ |
| 84 |
- struct sk_buff *skb; |
| 85 |
+ struct sk_buff *skb = NULL; |
| 86 |
|
| 87 |
/* Do not fail on null, as we are going to use this in cleanup code. */ |
| 88 |
if (!pskb || !(skb = *pskb)) |