aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAugust Lilleaas <august@augustl.com>2011-05-29 13:07:19 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2011-06-02 07:58:33 -0400
commitbf337b15c28ae25904a73e7e2e0de2f9c4f0e9f8 (patch)
tree2abd4877ffa6d4bec2ca0a00a70eef31b4cb0012 /drivers
parent105e53f863c04e1d9e5bb34bf753c9fdbce6a60c (diff)
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)
Diffstat (limited to 'drivers')
-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 @@
7 */ 7 */
8 8
9#include <linux/bug.h> 9#include <linux/bug.h>
10#include <linux/compiler.h>
10#include <linux/delay.h> 11#include <linux/delay.h>
11#include <linux/device.h> 12#include <linux/device.h>
12#include <linux/ethtool.h> 13#include <linux/ethtool.h>
@@ -73,7 +74,7 @@ struct rfc2734_arp {
73 __be32 fifo_lo; /* lo 32bits of sender's FIFO addr */ 74 __be32 fifo_lo; /* lo 32bits of sender's FIFO addr */
74 __be32 sip; /* Sender's IP Address */ 75 __be32 sip; /* Sender's IP Address */
75 __be32 tip; /* IP Address of requested hw addr */ 76 __be32 tip; /* IP Address of requested hw addr */
76} __attribute__((packed)); 77} __packed;
77 78
78/* This header format is specific to this driver implementation. */ 79/* This header format is specific to this driver implementation. */
79#define FWNET_ALEN 8 80#define FWNET_ALEN 8
@@ -81,7 +82,7 @@ struct rfc2734_arp {
81struct fwnet_header { 82struct fwnet_header {
82 u8 h_dest[FWNET_ALEN]; /* destination address */ 83 u8 h_dest[FWNET_ALEN]; /* destination address */
83 __be16 h_proto; /* packet type ID field */ 84 __be16 h_proto; /* packet type ID field */
84} __attribute__((packed)); 85} __packed;
85 86
86/* IPv4 and IPv6 encapsulation header */ 87/* IPv4 and IPv6 encapsulation header */
87struct rfc2734_header { 88struct rfc2734_header {