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

Migrate the ff_encap1() routine out into the normal output code.

Browse Source 
This will eventually be used by the A-MSDU encapsulation code that
I'm writing - the sub-frame encapsulation requirement is the same.
This commit is contained in:
Adrian Chadd 2013-08-26 09:52:05 +00:00
parent 6d485b61ff
commit 74b4c76e4e
3 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/net80211/ieee80211_output.c
View File

@ -3316,3 +3316,40 @@ ieee80211_beacon_update(struct ieee80211_node *ni,
return len_changed; return len_changed;
} }
/*
* Do Ethernet-LLC encapsulation for each payload in a fast frame
* tunnel encapsulation. The frame is assumed to have an Ethernet
* header at the front that must be stripped before prepending the
* LLC followed by the Ethernet header passed in (with an Ethernet
* type that specifies the payload size).
*/
struct mbuf *
ieee80211_ff_encap1(struct ieee80211vap *vap, struct mbuf *m,
const struct ether_header *eh)
{
struct llc *llc;
uint16_t payload;
/* XXX optimize by combining m_adj+M_PREPEND */
m_adj(m, sizeof(struct ether_header) - sizeof(struct llc));
llc = mtod(m, struct llc *);
llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
llc->llc_control = LLC_UI;
llc->llc_snap.org_code[0] = 0;
llc->llc_snap.org_code[1] = 0;
llc->llc_snap.org_code[2] = 0;
llc->llc_snap.ether_type = eh->ether_type;
payload = m->m_pkthdr.len; /* NB: w/o Ethernet header */
M_PREPEND(m, sizeof(struct ether_header), M_NOWAIT);
if (m == NULL) { /* XXX cannot happen */
IEEE80211_DPRINTF(vap, IEEE80211_MSG_SUPERG,
"%s: no space for ether_header\n", __func__);
vap->iv_stats.is_tx_nobuf++;
return NULL;
}
ETHER_HEADER_COPY(mtod(m, void *), eh);
mtod(m, struct ether_header *)->ether_type = htons(payload);
return m;
}

3
sys/net80211/ieee80211_proto.h
View File

@ -125,6 +125,9 @@ int ieee80211_send_probereq(struct ieee80211_node *ni,
const uint8_t da[IEEE80211_ADDR_LEN], const uint8_t da[IEEE80211_ADDR_LEN],
const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t bssid[IEEE80211_ADDR_LEN],
const uint8_t *ssid, size_t ssidlen); const uint8_t *ssid, size_t ssidlen);
struct mbuf * ieee80211_ff_encap1(struct ieee80211vap *, struct mbuf *,
const struct ether_header *);
/* /*
* The formation of ProbeResponse frames requires guidance to * The formation of ProbeResponse frames requires guidance to
* deal with legacy clients. When the client is identified as * deal with legacy clients. When the client is identified as

41
sys/net80211/ieee80211_superg.c
View File

@ -329,43 +329,6 @@ ieee80211_ff_decap(struct ieee80211_node *ni, struct mbuf *m)
#undef FF_LLC_SIZE #undef FF_LLC_SIZE
} }
/*
* Do Ethernet-LLC encapsulation for each payload in a fast frame
* tunnel encapsulation. The frame is assumed to have an Ethernet
* header at the front that must be stripped before prepending the
* LLC followed by the Ethernet header passed in (with an Ethernet
* type that specifies the payload size).
*/
static struct mbuf *
ff_encap1(struct ieee80211vap *vap, struct mbuf *m,
const struct ether_header *eh)
{
struct llc *llc;
uint16_t payload;
/* XXX optimize by combining m_adj+M_PREPEND */
m_adj(m, sizeof(struct ether_header) - sizeof(struct llc));
llc = mtod(m, struct llc *);
llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
llc->llc_control = LLC_UI;
llc->llc_snap.org_code[0] = 0;
llc->llc_snap.org_code[1] = 0;
llc->llc_snap.org_code[2] = 0;
llc->llc_snap.ether_type = eh->ether_type;
payload = m->m_pkthdr.len; /* NB: w/o Ethernet header */
M_PREPEND(m, sizeof(struct ether_header), M_NOWAIT);
if (m == NULL) { /* XXX cannot happen */
IEEE80211_DPRINTF(vap, IEEE80211_MSG_SUPERG,
"%s: no space for ether_header\n", __func__);
vap->iv_stats.is_tx_nobuf++;
return NULL;
}
ETHER_HEADER_COPY(mtod(m, void *), eh);
mtod(m, struct ether_header *)->ether_type = htons(payload);
return m;
}
/* /*
* Fast frame encapsulation. There must be two packets * Fast frame encapsulation. There must be two packets
* chained with m_nextpkt. We do header adjustment for * chained with m_nextpkt. We do header adjustment for
@ -424,10 +387,10 @@ ieee80211_ff_encap(struct ieee80211vap *vap, struct mbuf *m1, int hdrspace,
* Now do tunnel encapsulation. First, each * Now do tunnel encapsulation. First, each
* frame gets a standard encapsulation. * frame gets a standard encapsulation.
*/ */
m1 = ff_encap1(vap, m1, &eh1); m1 = ieee80211_ff_encap1(vap, m1, &eh1);
if (m1 == NULL) if (m1 == NULL)
goto bad; goto bad;
m2 = ff_encap1(vap, m2, &eh2); m2 = ieee80211_ff_encap1(vap, m2, &eh2);
if (m2 == NULL) if (m2 == NULL)
goto bad; goto bad;