From patchwork Wed Jul 21 20:59:58 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: 59501 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 0E2FDB70C5 for ; Thu, 22 Jul 2010 07:00:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756360Ab0GUVAS (ORCPT ); Wed, 21 Jul 2010 17:00:18 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:54211 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755949Ab0GUVAR (ORCPT ); Wed, 21 Jul 2010 17:00:17 -0400 Received: by yxg6 with SMTP id 6so37861yxg.19 for ; Wed, 21 Jul 2010 14:00:16 -0700 (PDT) Received: by 10.100.119.14 with SMTP id r14mr944581anc.18.1279746016536; Wed, 21 Jul 2010 14:00:16 -0700 (PDT) Received: from localhost.localdomain ([187.75.148.141]) by mx.google.com with ESMTPS id u14sm84148239ann.20.2010.07.21.14.00.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 21 Jul 2010 14:00:15 -0700 (PDT) From: "Gustavo F. Padovan" To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] net: remove last uses of __attribute__((packed)) Date: Wed, 21 Jul 2010 17:59:58 -0300 Message-Id: <1279745998-29694-2-git-send-email-padovan@profusion.mobi> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1279745998-29694-1-git-send-email-padovan@profusion.mobi> References: <1279745998-29694-1-git-send-email-padovan@profusion.mobi> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Network code uses the __packed macro instead of __attribute__((packed)). Signed-off-by: Gustavo F. Padovan --- include/net/mac80211.h | 2 +- net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 7f256e2..23e46ce 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -412,7 +412,7 @@ struct ieee80211_tx_rate { s8 idx; u8 count; u8 flags; -} __attribute__((packed)); +} __packed; /** * struct ieee80211_tx_info - skb transmit information diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c index 64d0875..3a43cf3 100644 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c @@ -469,7 +469,7 @@ struct arp_payload { __be32 src_ip; u_int8_t dst_hw[ETH_ALEN]; __be32 dst_ip; -} __attribute__ ((packed)); +} __packed; #ifdef DEBUG static void arp_print(struct arp_payload *payload)