summaryrefslogtreecommitdiffstats
path: root/drivers/firewire/net.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 14:49:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-22 14:49:48 -0700
commit441c196e84b11aad3123baa9320eee7abc6b5c98 (patch)
treeea51d689c9ac09cce10a5758f19d6adbd8a7a9d7 /drivers/firewire/net.c
parent951cc93a7493a81a47e20231441bc6cf17c98a37 (diff)
parent9a00c24ae7cb08dcd46edf1327a47871e8466444 (diff)
downloadlinux-stable-441c196e84b11aad3123baa9320eee7abc6b5c98.tar.gz
linux-stable-441c196e84b11aad3123baa9320eee7abc6b5c98.tar.bz2
linux-stable-441c196e84b11aad3123baa9320eee7abc6b5c98.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: document the sysfs ABIs firewire: cdev: ABI documentation enhancements firewire: cdev: prevent race between first get_info ioctl and bus reset event queuing firewire: cdev: return -ENOTTY for unimplemented ioctls, not -EINVAL firewire: ohci: skip soft reset retries after card ejection firewire: ohci: fix PHY reg access after card ejection firewire: ohci: add a comment on PHY reg access serialization firewire: ohci: reduce potential context_stop latency firewire: ohci: remove superfluous posted write flushes firewire: net: replacing deprecated __attribute__((packed)) with __packed
Diffstat (limited to 'drivers/firewire/net.c')
-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 eced1c25bf58..03a7a85d0424 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 {