From patchwork Wed Jul 21 20:59:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gustavo F. Padovan" X-Patchwork-Id: 59503 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 30722B70C5 for ; Thu, 22 Jul 2010 07:01:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754947Ab0GUVAP (ORCPT ); Wed, 21 Jul 2010 17:00:15 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:35442 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750906Ab0GUVAO (ORCPT ); Wed, 21 Jul 2010 17:00:14 -0400 Received: by gyg10 with SMTP id 10so35948gyg.19 for ; Wed, 21 Jul 2010 14:00:13 -0700 (PDT) Received: by 10.101.152.40 with SMTP id e40mr906209ano.198.1279746013475; Wed, 21 Jul 2010 14:00:13 -0700 (PDT) Received: from localhost.localdomain ([187.75.148.141]) by mx.google.com with ESMTPS id u14sm84148239ann.20.2010.07.21.14.00.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 21 Jul 2010 14:00:12 -0700 (PDT) From: "Gustavo F. Padovan" To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] irda: Use __packed annotation instead IRDA_PACKED macro Date: Wed, 21 Jul 2010 17:59:57 -0300 Message-Id: <1279745998-29694-1-git-send-email-padovan@profusion.mobi> X-Mailer: git-send-email 1.7.1.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove IRDA_PACKED macro, which maps to __attribute__((packed)). IRDA is one of the last users of __attribute__((packet)). Networking code uses __packed now. Signed-off-by: Gustavo F. Padovan --- include/net/irda/irda.h | 4 ---- include/net/irda/irlap_frame.h | 18 +++++++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h index 7e58206..3bed61d 100644 --- a/include/net/irda/irda.h +++ b/include/net/irda/irda.h @@ -53,10 +53,6 @@ typedef __u32 magic_t; #ifndef IRDA_ALIGN # define IRDA_ALIGN __attribute__((aligned)) #endif -#ifndef IRDA_PACK -# define IRDA_PACK __attribute__((packed)) -#endif - #ifdef CONFIG_IRDA_DEBUG diff --git a/include/net/irda/irlap_frame.h b/include/net/irda/irlap_frame.h index 641f88e..6b1dc4f 100644 --- a/include/net/irda/irlap_frame.h +++ b/include/net/irda/irlap_frame.h @@ -85,7 +85,7 @@ struct discovery_t; struct disc_frame { __u8 caddr; /* Connection address */ __u8 control; -} IRDA_PACK; +} __packed; struct xid_frame { __u8 caddr; /* Connection address */ @@ -96,41 +96,41 @@ struct xid_frame { __u8 flags; /* Discovery flags */ __u8 slotnr; __u8 version; -} IRDA_PACK; +} __packed; struct test_frame { __u8 caddr; /* Connection address */ __u8 control; __le32 saddr; /* Source device address */ __le32 daddr; /* Destination device address */ -} IRDA_PACK; +} __packed; struct ua_frame { __u8 caddr; __u8 control; __le32 saddr; /* Source device address */ __le32 daddr; /* Dest device address */ -} IRDA_PACK; +} __packed; struct dm_frame { __u8 caddr; /* Connection address */ __u8 control; -} IRDA_PACK; +} __packed; struct rd_frame { __u8 caddr; /* Connection address */ __u8 control; -} IRDA_PACK; +} __packed; struct rr_frame { __u8 caddr; /* Connection address */ __u8 control; -} IRDA_PACK; +} __packed; struct i_frame { __u8 caddr; __u8 control; -} IRDA_PACK; +} __packed; struct snrm_frame { __u8 caddr; @@ -138,7 +138,7 @@ struct snrm_frame { __le32 saddr; __le32 daddr; __u8 ncaddr; -} IRDA_PACK; +} __packed; void irlap_queue_xmit(struct irlap_cb *self, struct sk_buff *skb); void irlap_send_discovery_xid_frame(struct irlap_cb *, int S, __u8 s,