mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2025-02-16 15:24:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Only deliver frames to VAPs that are running.

Browse Source 
This includes the reinstatement of the ieee80211_input_all function as this functionality should live in the net80211 layer. Unfortunately the code for this is a tad on the ugly side.

Thanks to OpenWRT/nbd: https://dev.openwrt.org/log/trunk/package/madwifi/patches/334-input.patch


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3621 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mentor 2008-05-10 06:03:52 +00:00
parent dfdda8ca55
commit a192279dd6
3 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ath/if_ath.c
View File

@ -6795,25 +6795,10 @@ drop_micfail:
rs->rs_rssi, bf->bf_tsf);
ieee80211_unref_node(&ni);
} else {
struct ieee80211vap *vap;
struct sk_buff *tskb;
/* Create a new SKB copy for each VAP except the last
* one, which gets the original SKB. */
TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
if (vap == TAILQ_LAST(&ic->ic_vaps,
ieee80211vap_headtype))
tskb = skb;
else
tskb = skb_copy(skb, GFP_ATOMIC);
if (!tskb)
/* XXX: Brilliant OOM handling. */
vap->iv_devstats.tx_dropped++;
else
type = ieee80211_input(vap, NULL, skb,
rs->rs_rssi, bf->bf_tsf);
}
type = ieee80211_input_all(ic, skb,
rs->rs_rssi, bf->bf_tsf);
}
skb = NULL;
if (sc->sc_diversity) {
/* When using hardware fast diversity, change the default RX

52
net80211/ieee80211_input.c
View File

@ -194,7 +194,7 @@ iwspy_event(struct ieee80211vap *vap, struct ieee80211_node *ni, u_int rssi)
* Context: softIRQ (tasklet)
*/
int
ieee80211_input(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
ieee80211_input(struct ieee80211vap *vap, struct ieee80211_node *ni_or_null,
struct sk_buff *skb, int rssi, u_int64_t rtsf)
{
#define HAS_SEQ(type) ((type & 0x4) == 0)
@ -208,10 +208,14 @@ ieee80211_input(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
struct llc *llc;
#endif
int hdrspace;
u_int8_t dir, type, subtype;
u_int8_t dir, type = -1, subtype;
u_int8_t *bssid;
u_int16_t rxseq;
if ((vap->iv_dev->flags & (IFF_RUNNING | IFF_UP)) !=
(IFF_RUNNING | IFF_UP))
goto out;
/* Initialize ni as in the previous API. */
if (ni_or_null == NULL) {
/* This function does not 'own' vap->iv_bss, so we cannot
@ -222,7 +226,6 @@ ieee80211_input(struct ieee80211vap * vap, struct ieee80211_node *ni_or_null,
KASSERT(skb != NULL, ("null skb"));
KASSERT(ni != NULL, ("null node"));
ni->ni_inact = ni->ni_inact_reload;
type = -1; /* undefined */
/* In monitor mode, send everything directly to bpf.
* Also do not process frames w/o i_addr2 any further.
@ -845,8 +848,49 @@ out:
return type;
#undef HAS_SEQ
}
EXPORT_SYMBOL(ieee80211_input);
EXPORT_SYMBOL(ieee80211_input);
/*
* Context: softIRQ (tasklet)
*/
int
ieee80211_input_all(struct ieee80211com *ic,
struct sk_buff *skb, int rssi, u_int64_t rtsf)
{
struct ieee80211vap *vap, *next_vap;
struct sk_buff *tskb = NULL;
int type = -1; /* Used to determine when to blinks LEDs. */
/* Create a new SKB copy for each VAP except the last
* one, which gets the original SKB. */
vap = TAILQ_FIRST(&ic->ic_vaps);
while (vap) {
for (next_vap = TAILQ_NEXT(vap, iv_next); next_vap;
next_vap = TAILQ_NEXT(next_vap, iv_next)) {
if ((next_vap->iv_dev->flags & (IFF_RUNNING | IFF_UP))
== (IFF_RUNNING | IFF_UP))
break;
}
if (!next_vap) {
tskb = skb;
skb = NULL;
} else
tskb = skb_copy(skb, GFP_ATOMIC);
if (!tskb)
/* XXX: Brilliant OOM handling. */
vap->iv_devstats.tx_dropped++;
else
type = ieee80211_input(vap, NULL, tskb, rssi, rtsf);
vap = next_vap;
};
ieee80211_dev_kfree_skb(&skb);
return type;
}
EXPORT_SYMBOL(ieee80211_input_all);
/*
* Determines whether a frame should be accepted, based on information

1
net80211/ieee80211_proto.h
View File

@ -65,6 +65,7 @@ void ieee80211_proto_vdetach(struct ieee80211vap *);
struct ieee80211_node;
struct ieee80211_channel *ieee80211_doth_findchan(struct ieee80211vap *, u_int8_t);
int ieee80211_input(struct ieee80211vap *, struct ieee80211_node *, struct sk_buff *, int, u_int64_t);
int ieee80211_input_all(struct ieee80211com *, struct sk_buff *, int, u_int64_t);
int ieee80211_setup_rates(struct ieee80211_node *, const u_int8_t *,
const u_int8_t *, int);
void ieee80211_saveie(u_int8_t **, const u_int8_t *);