From patchwork Wed Dec 17 22:49:06 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Ortiz X-Patchwork-Id: 14582 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 70BBFDDF2B for ; Thu, 18 Dec 2008 09:46:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752202AbYLQWqo (ORCPT ); Wed, 17 Dec 2008 17:46:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752178AbYLQWqn (ORCPT ); Wed, 17 Dec 2008 17:46:43 -0500 Received: from 30.mail-out.ovh.net ([213.186.62.213]:42671 "HELO 30.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750961AbYLQWqn (ORCPT ); Wed, 17 Dec 2008 17:46:43 -0500 Received: (qmail 16920 invoked by uid 503); 17 Dec 2008 22:46:19 -0000 Received: from b7.ovh.net (HELO mail174.ha.ovh.net) (213.186.33.57) by 30.mail-out.ovh.net with SMTP; 17 Dec 2008 22:46:19 -0000 Received: from b0.ovh.net (HELO queue-out) (213.186.33.50) by b0.ovh.net with SMTP; 17 Dec 2008 22:46:39 -0000 Received: from aannecy-256-1-136-213.w90-27.abo.wanadoo.fr (HELO sortiz-mobl) (samuel%sortiz.org@90.27.255.213) by ns0.ovh.net with SMTP; 17 Dec 2008 22:46:37 -0000 Date: Wed, 17 Dec 2008 23:49:06 +0100 From: Samuel Ortiz To: "David S. Miller" Cc: netdev@vger.kernel.org, irda-users@lists.sourceforge.net Subject: [PATCH] irda: Add irda_skb_cb qdisc related padding Message-ID: <20081217224906.GA5783@sortiz.org> Reply-To: Samuel Ortiz MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Ovh-Tracer-Id: 9317103204361087126 X-Ovh-Remote: 90.27.255.213 (aannecy-256-1-136-213.w90-27.abo.wanadoo.fr) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-Spam-Check: DONE|H 0.5/N Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 */