diff --git a/[refs] b/[refs] index ae79de2bfbe0..3c027a4d59c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fccd2814f8ebc8f1bd325dc46e11c333fc76ab3 +refs/heads/master: 69c30e1e7492192f882a3fc11888b320fde5206a diff --git a/trunk/include/net/irda/irda_device.h b/trunk/include/net/irda/irda_device.h index 3025ae17ddbe..94c852d47d0f 100644 --- a/trunk/include/net/irda/irda_device.h +++ b/trunk/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 */