From 68b9492dcfc242534907208c10d7e327854fffbc Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Wed, 21 Jul 2010 10:59:58 +0000
Subject: [PATCH] --- yaml --- r: 203663 b: refs/heads/master c:
 3f30fc1570626f11e8f3efe5ebd41fe96e847ed1 h: refs/heads/master i:   203661:
 71ac0096aae53fd0a7f7b91009dae33435d9ac8f   203659:
 acddf818438a268f1577cacc6f55e1749c70e233   203655:
 70dbdc324fde20e5c12534e39666091a5835547f   203647:
 de843dbee36a4dabd2bffe2551273dd55c2caec4 v: v3

---
 [refs]                                   | 2 +-
 trunk/include/net/mac80211.h             | 2 +-
 trunk/net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4ed161ae4516..87f644c7bbcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 942875ffc102a6b9992120808e4990eda7a618f6
+refs/heads/master: 3f30fc1570626f11e8f3efe5ebd41fe96e847ed1
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 7f256e23c57f..23e46cee06f9 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/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/trunk/net/ipv4/netfilter/ipt_CLUSTERIP.c b/trunk/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 64d0875f5192..3a43cf36db87 100644
--- a/trunk/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/trunk/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)