* Removing debugging flag to lower the debug output. Moreover the removed DEBUG_ELEMID flag proved unuseful anyway.

* Whitespace cleanup.
* Uniform usage of pointer char.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34789 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Colin Günther
2009-12-28 04:39:15 +00:00
parent 448671a39c
commit 430eb68718
@@ -391,7 +391,8 @@ ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen)
/* /*
* Decrements the reference-counter and * Decrements the reference-counter and
* tests whether it became zero. * tests whether it became zero.
* NB: The negation is not atomar. Must work until sth. better is found. * NB: The negation of atomic_add is not atomar. Must work until sth. better is
* found.
* *
* @return 1 reference-counter became zero * @return 1 reference-counter became zero
* @return 0 reference-counter didn't became zero * @return 0 reference-counter didn't became zero
@@ -399,7 +400,7 @@ ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen)
int int
ieee80211_node_dectestref(struct ieee80211_node* ni) ieee80211_node_dectestref(struct ieee80211_node* ni)
{ {
/* XXX need equivalent of atomic_dec_and_test */ // XXX need equivalent of atomic_dec_and_test
atomic_add((vint32*)&ni->ni_refcnt, -1); atomic_add((vint32*)&ni->ni_refcnt, -1);
return !atomic_add((vint32*)&ni->ni_refcnt, 0); return !atomic_add((vint32*)&ni->ni_refcnt, 0);
} }
@@ -430,25 +431,27 @@ void
ieee80211_flush_ifq(struct ifqueue* ifq, struct ieee80211vap* vap) ieee80211_flush_ifq(struct ifqueue* ifq, struct ieee80211vap* vap)
{ {
struct ieee80211_node* ni; struct ieee80211_node* ni;
struct mbuf *m, **mprev; struct mbuf* m;
struct mbuf** mprev;
IF_LOCK(ifq); IF_LOCK(ifq);
mprev = &ifq->ifq_head; mprev = &ifq->ifq_head;
while ((m = *mprev) != NULL) { while ((m = *mprev) != NULL) {
ni = (struct ieee80211_node*)m->m_pkthdr.rcvif; ni = (struct ieee80211_node*)m->m_pkthdr.rcvif;
if (ni != NULL && ni->ni_vap == vap) { if (ni != NULL && ni->ni_vap == vap) {
*mprev = m->m_nextpkt; /* remove from list */ *mprev = m->m_nextpkt;
// remove from list
ifq->ifq_len--; ifq->ifq_len--;
m_freem(m); m_freem(m);
ieee80211_free_node(ni); /* reclaim ref */ ieee80211_free_node(ni);
// reclaim ref
} else } else
mprev = &m->m_nextpkt; mprev = &m->m_nextpkt;
} }
/* recalculate tail ptr */ // recalculate tail ptr
m = ifq->ifq_head; m = ifq->ifq_head;
for (; m != NULL && m->m_nextpkt != NULL; m = m->m_nextpkt) for (; m != NULL && m->m_nextpkt != NULL; m = m->m_nextpkt);
;
ifq->ifq_tail = m; ifq->ifq_tail = m;
IF_UNLOCK(ifq); IF_UNLOCK(ifq);
} }
@@ -476,8 +479,8 @@ ieee80211_add_callback(struct mbuf *m,
void void
ieee80211_process_callback(struct ieee80211_node *ni, ieee80211_process_callback(struct ieee80211_node* ni, struct mbuf* m,
struct mbuf *m, int status) int status)
{ {
struct m_tag* mtag; struct m_tag* mtag;
@@ -493,7 +496,6 @@ void
ieee80211_sysctl_vattach(struct ieee80211vap* vap) ieee80211_sysctl_vattach(struct ieee80211vap* vap)
{ {
vap->iv_debug = IEEE80211_MSG_XRATE vap->iv_debug = IEEE80211_MSG_XRATE
| IEEE80211_MSG_ELEMID
| IEEE80211_MSG_NODE | IEEE80211_MSG_NODE
| IEEE80211_MSG_ASSOC | IEEE80211_MSG_ASSOC
| IEEE80211_MSG_AUTH | IEEE80211_MSG_AUTH
@@ -539,10 +541,9 @@ ieee80211_notify_node_join(struct ieee80211_node *ni, int newassoc)
struct ieee80211vap* vap = ni->ni_vap; struct ieee80211vap* vap = ni->ni_vap;
struct ifnet* ifp = vap->iv_ifp; struct ifnet* ifp = vap->iv_ifp;
if (ni == vap->iv_bss) { if (ni == vap->iv_bss)
if_link_state_change(ifp, LINK_STATE_UP); if_link_state_change(ifp, LINK_STATE_UP);
} }
}
void void
@@ -551,10 +552,9 @@ ieee80211_notify_node_leave(struct ieee80211_node *ni)
struct ieee80211vap* vap = ni->ni_vap; struct ieee80211vap* vap = ni->ni_vap;
struct ifnet* ifp = vap->iv_ifp; struct ifnet* ifp = vap->iv_ifp;
if (ni == vap->iv_bss) { if (ni == vap->iv_bss)
if_link_state_change(ifp, LINK_STATE_DOWN); if_link_state_change(ifp, LINK_STATE_DOWN);
} }
}
void void