Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=69c30e...
Commit:     69c30e1e7492192f882a3fc11888b320fde5206a
Parent:     2fccd2814f8ebc8f1bd325dc46e11c333fc76ab3
Author:     Samuel Ortiz <samuel@sortiz.org>
AuthorDate: Wed Dec 17 15:44:58 2008 -0800
Committer:  David S. Miller <davem@davemloft.net>
CommitDate: Wed Dec 17 15:44:58 2008 -0800

    irda: Add irda_skb_cb qdisc related padding
    
    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 <samuel@sortiz.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/net/irda/irda_device.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h
index 3025ae1..94c852d 100644
--- a/include/net/irda/irda_device.h
+++ b/include/net/irda/irda_device.h
@@ -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 */
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html