d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rum: simplify error handling in rum_newstate().

Browse Source 
Tested with WUSB54GC, STA mode.

Reviewed by:	adrian
Differential Revision:	https://reviews.freebsd.org/D5544
This commit is contained in:
avos 2016-03-21 22:14:48 +00:00
parent ccef35d926
commit ed9c9eb3fa
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/usb/wlan/if_rum.c
View File

@ -819,7 +819,7 @@ rum_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
const struct ieee80211_txparam *tp;
enum ieee80211_state ostate;
struct ieee80211_node *ni;
int ret;
int ret = 0;
ostate = vap->iv_state;
DPRINTF("%s -> %s\n",
@ -872,6 +872,7 @@ rum_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)];
if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE)
rum_ratectl_start(sc, ni);
run_fail:
ieee80211_free_node(ni);
break;
default:
@ -879,13 +880,7 @@ rum_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
}
RUM_UNLOCK(sc);
IEEE80211_LOCK(ic);
return (rvp->newstate(vap, nstate, arg));
run_fail:
RUM_UNLOCK(sc);
IEEE80211_LOCK(ic);
ieee80211_free_node(ni);
return ret;
return (ret == 0 ? rvp->newstate(vap, nstate, arg) : ret);
}
static void