aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2009-08-17 12:54:50 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-08-20 11:36:01 -0400
commit0fefe0fda4376eff97be965a41714da38fe4a36d (patch)
tree089dc39ebe76dc74b4e42f791ed8b26f99aa1f8c /drivers/net/wireless/rt2x00
parent05a32730f16e7b91e9fd2d11f26db152e5c9a68d (diff)
rt2x00: Set SKBDESC_L2_PADDED in RX path
When the RX descriptor indicates the frame was L2 padded, the SKBDESC_L2_PADDED flag should be set to make sure the L2 padding is removed before it is send to mac80211. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00')
-rw-r--r--drivers/net/wireless/rt2x00/rt2800usb.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index c82474ebba31..6de2edab51ec 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -2163,8 +2163,10 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
2163 if (rt2x00_get_field32(rxd0, RXD_W0_MY_BSS)) 2163 if (rt2x00_get_field32(rxd0, RXD_W0_MY_BSS))
2164 rxdesc->dev_flags |= RXDONE_MY_BSS; 2164 rxdesc->dev_flags |= RXDONE_MY_BSS;
2165 2165
2166 if (rt2x00_get_field32(rxd0, RXD_W0_L2PAD)) 2166 if (rt2x00_get_field32(rxd0, RXD_W0_L2PAD)) {
2167 rxdesc->dev_flags |= RXDONE_L2PAD; 2167 rxdesc->dev_flags |= RXDONE_L2PAD;
2168 skbdesc->flags |= SKBDESC_L2_PADDED;
2169 }
2168 2170
2169 if (rt2x00_get_field32(rxwi1, RXWI_W1_SHORT_GI)) 2171 if (rt2x00_get_field32(rxwi1, RXWI_W1_SHORT_GI))
2170 rxdesc->flags |= RX_FLAG_SHORT_GI; 2172 rxdesc->flags |= RX_FLAG_SHORT_GI;