projects
/
madwifi
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a suffix to onoe and amrr rate sysctl names entries, so that they do not conflict
[madwifi/.git]
/
ath_rate
/
amrr
/
amrr.c
diff --git
a/ath_rate/amrr/amrr.c
b/ath_rate/amrr/amrr.c
index a23aeca2af3058a143f84f25ac30908bb6e5ea7a..725291d53ccfa4c30b5119094d964d134b20b397 100644
(file)
--- a/
ath_rate/amrr/amrr.c
+++ b/
ath_rate/amrr/amrr.c
@@
-317,7
+317,7
@@
ath_rate_newstate(struct ieee80211vap *vap, enum ieee80211_state state)
{
struct ieee80211com *ic = vap->iv_ic;
struct ath_softc *sc = ic->ic_dev->priv;
{
struct ieee80211com *ic = vap->iv_ic;
struct ath_softc *sc = ic->ic_dev->priv;
- struct amrr_softc *asc = (struct amrr_softc *)
sc->sc_rc;
+ struct amrr_softc *asc = (struct amrr_softc *)sc->sc_rc;
struct ieee80211_node *ni;
if (state == IEEE80211_S_INIT) {
struct ieee80211_node *ni;
if (state == IEEE80211_S_INIT) {
@@
-473,7
+473,7
@@
ath_rate_attach(struct ath_softc *sc)
static void
ath_rate_detach(struct ath_ratectrl *arc)
{
static void
ath_rate_detach(struct ath_ratectrl *arc)
{
- struct amrr_softc *asc = (struct amrr_softc *)
arc;
+ struct amrr_softc *asc = (struct amrr_softc *)arc;
del_timer(&asc->timer);
kfree(asc);
del_timer(&asc->timer);
kfree(asc);
@@
-520,7
+520,7
@@
static ctl_table ath_rate_static_sysctls[] = {
};
static ctl_table ath_rate_table[] = {
{ .ctl_name = CTL_AUTO,
};
static ctl_table ath_rate_table[] = {
{ .ctl_name = CTL_AUTO,
- .procname = "rate",
+ .procname = "rate
_amrr
",
.mode = 0555,
.child = ath_rate_static_sysctls
}, { 0 }
.mode = 0555,
.child = ath_rate_static_sysctls
}, { 0 }