summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAugust Lilleaas <august@augustl.com>2011-05-29 19:07:19 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2011-06-02 13:58:33 +0200
commitbf337b15c28ae25904a73e7e2e0de2f9c4f0e9f8 (patch)
tree2abd4877ffa6d4bec2ca0a00a70eef31b4cb0012
parentfirewire: sbp2: parallelize login, reconnect, logout (diff)
downloadlinux-bf337b15c28ae25904a73e7e2e0de2f9c4f0e9f8.tar.xz
linux-bf337b15c28ae25904a73e7e2e0de2f9c4f0e9f8.zip
firewire: net: replacing deprecated __attribute__((packed)) with __packed
Fixing a deprecation, replacing __attribute__((packed)) with __packed. It was deprecated for portability, specifically to avoid GCC specific code. See commit 82ddcb040570411fc2d421d96b3e69711c670328. Signed-off-by: August Lilleaas <august@augustl.com> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> (added include compiler.h)
-rw-r--r--drivers/firewire/net.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index b9762d07198d..512492a122df 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -7,6 +7,7 @@
*/
#include <linux/bug.h>
+#include <linux/compiler.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/ethtool.h>
@@ -73,7 +74,7 @@ struct rfc2734_arp {
__be32 fifo_lo; /* lo 32bits of sender's FIFO addr */
__be32 sip; /* Sender's IP Address */
__be32 tip; /* IP Address of requested hw addr */
-} __attribute__((packed));
+} __packed;
/* This header format is specific to this driver implementation. */
#define FWNET_ALEN 8
@@ -81,7 +82,7 @@ struct rfc2734_arp {
struct fwnet_header {
u8 h_dest[FWNET_ALEN]; /* destination address */
__be16 h_proto; /* packet type ID field */
-} __attribute__((packed));
+} __packed;
/* IPv4 and IPv6 encapsulation header */
struct rfc2734_header {