[haiku-commits] r41251 - in haiku/trunk/src/add-ons/kernel/drivers/network/wlan: broadcom43xx/dev/bwi iprowifi3945/dev/wpi iprowifi4965/dev/iwn ralinkwifi/dev/ral
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 15 Apr 2011 01:00:34 +0200 (CEST)
Author: korli
Date: 2011-04-15 01:00:33 +0200 (Fri, 15 Apr 2011)
New Revision: 41251
Changeset: https://dev.haiku-os.org/changeset/41251
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi/if_bwi.c
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi/if_wpi.c
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c
Log:
we don't report stats for now, as some init is missing for ratectl, this should
avoid KDL for these drivers.
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi/if_bwi.c
===================================================================
---
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi/if_bwi.c
2011-04-14 17:48:52 UTC (rev 41250)
+++
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi/if_bwi.c
2011-04-14 23:00:33 UTC (rev 41251)
@@ -2982,7 +2982,9 @@
} else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) {
rate = rate_fb = tp->ucastrate;
} else {
+#ifndef __HAIKU__
rix = ieee80211_ratectl_rate(ni, NULL, pkt_len);
+#endif
rate = ni->ni_txrate;
if (rix > 0) {
@@ -3378,9 +3380,11 @@
* well so to avoid over-aggressive downshifting we
* treat any number of retries as "1".
*/
+#ifndef __HAIKU__
ieee80211_ratectl_tx_complete(vap, ni,
(data_txcnt > 1) ? IEEE80211_RATECTL_TX_SUCCESS :
IEEE80211_RATECTL_TX_FAILURE, &acked, NULL);
+#endif
}
/*
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi/if_wpi.c
===================================================================
---
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi/if_wpi.c
2011-04-14 17:48:52 UTC (rev 41250)
+++
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi/if_wpi.c
2011-04-14 23:00:33 UTC (rev 41251)
@@ -1600,8 +1600,10 @@
DPRINTFN(WPI_DEBUG_TX, ("%d retries\n", stat->ntries));
retrycnt = 1;
}
+#ifndef __HAIKU__
ieee80211_ratectl_tx_complete(vap, ni, IEEE80211_RATECTL_TX_SUCCESS,
&retrycnt, NULL);
+#endif
/* XXX oerrors should only count errors !maxtries */
if ((le32toh(stat->status) & 0xff) != 1)
@@ -1947,7 +1949,9 @@
} else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) {
rate = tp->ucastrate;
} else {
+#ifndef __HAIKU__
(void) ieee80211_ratectl_rate(ni, NULL, 0);
+#endif
rate = ni->ni_txrate;
}
tx->rate = wpi_plcp_signal(rate);
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c
===================================================================
---
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c
2011-04-14 17:48:52 UTC (rev 41250)
+++
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c
2011-04-14 23:00:33 UTC (rev 41251)
@@ -826,9 +826,7 @@
ivp->iv_newstate = vap->iv_newstate;
vap->iv_newstate = iwn_newstate;
-#ifndef __HAIKU__
ieee80211_ratectl_init(vap);
-#endif
/* Complete setup. */
ieee80211_vap_attach(vap, iwn_media_change, ieee80211_media_status);
ic->ic_opmode = opmode;
@@ -840,9 +838,7 @@
{
struct iwn_vap *ivp = IWN_VAP(vap);
-#ifndef __HAIKU__
ieee80211_ratectl_deinit(vap);
-#endif
ieee80211_vap_detach(vap);
free(ivp, M_80211_VAP);
}
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c
===================================================================
---
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c
2011-04-14 17:48:52 UTC (rev 41250)
+++
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2560.c
2011-04-14 23:00:33 UTC (rev 41251)
@@ -953,10 +953,12 @@
retrycnt = 0;
DPRINTFN(sc, 10, "%s\n", "data frame sent
successfully");
+#ifndef __HAIKU__
if (data->rix != IEEE80211_FIXED_RATE_NONE)
ieee80211_ratectl_tx_complete(vap, ni,
IEEE80211_RATECTL_TX_SUCCESS,
&retrycnt, NULL);
+#endif
ifp->if_opackets++;
break;
@@ -965,10 +967,12 @@
DPRINTFN(sc, 9, "data frame sent after %u retries\n",
retrycnt);
+#ifndef __HAIKU__
if (data->rix != IEEE80211_FIXED_RATE_NONE)
ieee80211_ratectl_tx_complete(vap, ni,
IEEE80211_RATECTL_TX_SUCCESS,
&retrycnt, NULL);
+#endif
ifp->if_opackets++;
break;
@@ -977,10 +981,12 @@
DPRINTFN(sc, 9, "data frame failed after %d retries\n",
retrycnt);
+#ifndef __HAIKU__
if (data->rix != IEEE80211_FIXED_RATE_NONE)
ieee80211_ratectl_tx_complete(vap, ni,
IEEE80211_RATECTL_TX_FAILURE,
&retrycnt, NULL);
+#endif
ifp->if_oerrors++;
break;
@@ -1800,7 +1806,9 @@
} else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) {
rate = tp->ucastrate;
} else {
+#ifndef __HAIKU__
(void) ieee80211_ratectl_rate(ni, NULL, 0);
+#endif
rate = ni->ni_txrate;
}
Modified:
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c
===================================================================
---
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c
2011-04-14 17:48:52 UTC (rev 41250)
+++
haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/rt2661.c
2011-04-14 23:00:33 UTC (rev 41251)
@@ -904,10 +904,12 @@
DPRINTFN(sc, 10, "data frame sent successfully after "
"%d retries\n", retrycnt);
+#ifndef __HAIKU__
if (data->rix != IEEE80211_FIXED_RATE_NONE)
ieee80211_ratectl_tx_complete(vap, ni,
IEEE80211_RATECTL_TX_SUCCESS,
&retrycnt, NULL);
+#endif
ifp->if_opackets++;
break;
@@ -916,10 +918,12 @@
DPRINTFN(sc, 9, "%s\n",
"sending data frame failed (too much retries)");
+#ifndef __HAIKU__
if (data->rix != IEEE80211_FIXED_RATE_NONE)
ieee80211_ratectl_tx_complete(vap, ni,
IEEE80211_RATECTL_TX_FAILURE,
&retrycnt, NULL);
+#endif
ifp->if_oerrors++;
break;
@@ -1485,7 +1489,9 @@
} else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE) {
rate = tp->ucastrate;
} else {
+#ifndef __HAIKU__
(void) ieee80211_ratectl_rate(ni, NULL, 0);
+#endif
rate = ni->ni_txrate;
}
rate &= IEEE80211_RATE_VAL;
Other related posts:
