On Friday 04 December 2009, Gertjan van Wingerde wrote: > Ensure that frames without payload are properly trimmed in > rt2x00queue_insert_l2pad. > > This should fix the bug reported by Benoit Papillault in: > http://marc.info/?l=linux-wireless&m=125974773006734&w=2 > > Signed-off-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx> Acked-by: Ivo van Doorn <IvDoorn@xxxxxxxxx> > --- > drivers/net/wireless/rt2x00/rt2x00queue.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c > index 7452fa8..3d8fb68 100644 > --- a/drivers/net/wireless/rt2x00/rt2x00queue.c > +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c > @@ -180,7 +180,7 @@ void rt2x00queue_insert_l2pad(struct sk_buff *skb, unsigned int header_length) > unsigned int payload_length = skb->len - header_length; > unsigned int header_align = ALIGN_SIZE(skb, 0); > unsigned int payload_align = ALIGN_SIZE(skb, header_length); > - unsigned int l2pad = L2PAD_SIZE(header_length); > + unsigned int l2pad = payload_length ? L2PAD_SIZE(header_length) : 0; > > /* > * Adjust the header alignment if the payload needs to be moved more -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
