mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-22 14:31:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Only try to remove padding in frames where a data body exists. Otherwise, aligning the data pushes some of it out of the buffer.

Browse Source 
git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2991 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mentor 2007-11-28 21:32:50 +00:00
parent d67559b719
commit 79bf489a8d
2 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
ath/if_ath.c
View File

@ -5802,29 +5802,35 @@ ath_rx_capture(struct net_device *dev, const struct ath_buf *bf,
{
struct ath_softc *sc = dev->priv;
struct ieee80211com *ic = &sc->sc_ic;
struct ieee80211_frame *wh = (struct ieee80211_frame *) skb->data;
unsigned int headersize = ieee80211_anyhdrsize(wh);
int padbytes = roundup(headersize, 4) - headersize;
KASSERT(ic->ic_flags & IEEE80211_F_DATAPAD,
("data padding not enabled?"));
if (padbytes > 0) {
/* Remove hw pad bytes */
struct sk_buff *skb1 = skb_copy(skb, GFP_ATOMIC);
if (skb1 == NULL)
return;
memmove(skb1->data + padbytes, skb1->data, headersize);
skb_pull(skb1, padbytes);
/* We must duplicate the reference after an skb_copy! */
if (SKB_CB(skb)->ni != NULL) {
SKB_CB(skb1)->ni = ieee80211_ref_node(SKB_CB(skb)->ni);
struct ieee80211_frame *wh = (struct ieee80211_frame *)skb->data;
struct sk_buff *tskb = skb;
unsigned int headersize;
int padbytes;
KASSERT(ic->ic_flags & IEEE80211_F_DATAPAD,
("data padding not enabled?"));
/* Only non-control frames have bodies, and hence padding. */
if ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) !=
IEEE80211_FC0_TYPE_CTL) {
headersize = ieee80211_anyhdrsize(wh);
padbytes = roundup(headersize, 4) - headersize;
if (padbytes > 0) {
/* Copy skb and remove HW pad bytes */
tskb = skb_copy(skb, GFP_ATOMIC);
if (tskb == NULL)
return;
/* Reference any node from the source skb. */
if (SKB_CB(skb)->ni != NULL)
SKB_CB(tskb)->ni = ieee80211_ref_node(SKB_CB(skb)->ni);
memmove(tskb->data + padbytes, tskb->data, headersize);
skb_pull(tskb, padbytes);
}
ieee80211_input_monitor(ic, skb1, bf, 0, rtsf, sc);
ieee80211_dev_kfree_skb(&skb1);
} else {
ieee80211_input_monitor(ic, skb, bf, 0, rtsf, sc);
}
}
ieee80211_input_monitor(ic, tskb, bf, 0, rtsf, sc);
if (tskb != skb)
ieee80211_dev_kfree_skb(&tskb);
}
@ -5864,17 +5870,22 @@ ath_tx_capture(struct net_device *dev, const struct ath_buf *bf, struct sk_buff
skb_orphan(skb);
}
wh = (struct ieee80211_frame *) skb->data;
headersize = ieee80211_anyhdrsize(wh);
padbytes = roundup(headersize, 4) - headersize;
if (padbytes > 0) {
/* Unlike in rx_capture, we're freeing the skb at the end
* anyway, so we don't need to worry about using a copy */
memmove(skb->data + padbytes, skb->data, headersize);
skb_pull(skb, padbytes);
/* Only non-control frames have bodies, and hence padding. */
wh = (struct ieee80211_frame *)skb->data;
if ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) !=
IEEE80211_FC0_TYPE_CTL) {
headersize = ieee80211_anyhdrsize(wh);
padbytes = roundup(headersize, 4) - headersize;
if (padbytes > 0) {
/* Unlike in rx_capture, we're freeing the skb at the
* end anyway, so we don't need to worry about using a
* copy. */
memmove(skb->data + padbytes, skb->data, headersize);
skb_pull(skb, padbytes);
}
}
if (skb_headroom(skb) < extra &&
if ((skb_headroom(skb) < extra) &&
pskb_expand_head(skb, extra, 0, GFP_ATOMIC)) {
printk("%s:%d %s\n", __FILE__, __LINE__, __func__);
goto done;
@ -5883,8 +5894,7 @@ ath_tx_capture(struct net_device *dev, const struct ath_buf *bf, struct sk_buff
if (sc->sc_nmonvaps > 0) {
/* Pass up tsf clock in mactime
* TX descriptor contains the transmit time in TUs,
* (bits 25-10 of the TSF).
*/
* (bits 25-10 of the TSF). */
tstamp = ts->ts_tstamp << 10;
if ((tsf & 0x3ffffff) < tstamp)

7
net80211/ieee80211_proto.h
View File

@ -119,13 +119,16 @@ ieee80211_anyhdrsize(const void *data)
{
const struct ieee80211_frame *wh = data;
if ((wh->i_fc[0]&IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) {
if ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) {
switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
case IEEE80211_FC0_SUBTYPE_CTS:
case IEEE80211_FC0_SUBTYPE_ACK:
return sizeof(struct ieee80211_frame_ack);
break;
default:
return sizeof(struct ieee80211_frame_min);
break;
}
return sizeof(struct ieee80211_frame_min);
} else
return ieee80211_hdrsize(data);
}