irda: Add irda_skb_cb qdisc related padding

PATCH Applied Samuel Ortiz 2 participants 2 messages Dec 17, 2008

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Samuel Ortiz

author

2008-12-17 22:46 UTC #0 lore raw

PATCH 1/1 irda: Add irda_skb_cb qdisc related padding

Hi Dave,

We need to pad irda_skb_cb in order to keep it safe accross dev_queue_xmit() calls. This is some ugly and temporary hack triggered by recent qisc code changes.
Even though it fixes bugzilla.kernel.org bug #11795, it will be replaced by a proper fix before 2.6.29 is released.

Signed-off-by Samuel Ortiz <[email protected]>

---
 include/net/irda/irda_device.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

include/net/irda/irda_device.h +3 -1

index 3025ae1..94c852d 100644
@@ -135,9 +135,11 @@ struct dongle_reg {
 
 /* 
  * Per-packet information we need to hide inside sk_buff 
- * (must not exceed 48 bytes, check with struct sk_buff) 
+ * (must not exceed 48 bytes, check with struct sk_buff)
+ * The default_qdisc_pad field is a temporary hack.
  */
 struct irda_skb_cb {
+	unsigned int default_qdisc_pad;
 	magic_t magic;       /* Be sure that we can trust the information */
 	__u32   next_speed;  /* The Speed to be set *after* this frame */
 	__u16   mtt;         /* Minimum turn around time */

Signature · 1 line

1.6.0.4.766.g6fc4a.dirty

David Miller

maintainer Applied

2008-12-17 23:45 UTC #1 lore raw

From: Samuel Ortiz <[email protected]>
Date: Wed, 17 Dec 2008 23:49:06 +0100

Quoted 7 lines

We need to pad irda_skb_cb in order to keep it safe accross dev_queue_xmit() calls. This is some ugly and temporary hack triggered by recent qisc code changes.
Even though it fixes bugzilla.kernel.org bug #11795, it will be replaced by a proper fix before 2.6.29 is released.
Signed-off-by Samuel Ortiz <[email protected]>

Applied, thanks Samuel.