Commit 942875ff authored by Gustavo F. Padovan's avatar Gustavo F. Padovan Committed by David S. Miller
Browse files

irda: Use __packed annotation instead IRDA_PACKED macro



Remove IRDA_PACKED macro, which maps to __attribute__((packed)). IRDA is
one of the last users of __attribute__((packet)). Networking code uses
__packed now.
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2e4e7a97
...@@ -53,10 +53,6 @@ typedef __u32 magic_t; ...@@ -53,10 +53,6 @@ typedef __u32 magic_t;
#ifndef IRDA_ALIGN #ifndef IRDA_ALIGN
# define IRDA_ALIGN __attribute__((aligned)) # define IRDA_ALIGN __attribute__((aligned))
#endif #endif
#ifndef IRDA_PACK
# define IRDA_PACK __attribute__((packed))
#endif
#ifdef CONFIG_IRDA_DEBUG #ifdef CONFIG_IRDA_DEBUG
......
...@@ -85,7 +85,7 @@ struct discovery_t; ...@@ -85,7 +85,7 @@ struct discovery_t;
struct disc_frame { struct disc_frame {
__u8 caddr; /* Connection address */ __u8 caddr; /* Connection address */
__u8 control; __u8 control;
} IRDA_PACK; } __packed;
struct xid_frame { struct xid_frame {
__u8 caddr; /* Connection address */ __u8 caddr; /* Connection address */
...@@ -96,41 +96,41 @@ struct xid_frame { ...@@ -96,41 +96,41 @@ struct xid_frame {
__u8 flags; /* Discovery flags */ __u8 flags; /* Discovery flags */
__u8 slotnr; __u8 slotnr;
__u8 version; __u8 version;
} IRDA_PACK; } __packed;
struct test_frame { struct test_frame {
__u8 caddr; /* Connection address */ __u8 caddr; /* Connection address */
__u8 control; __u8 control;
__le32 saddr; /* Source device address */ __le32 saddr; /* Source device address */
__le32 daddr; /* Destination device address */ __le32 daddr; /* Destination device address */
} IRDA_PACK; } __packed;
struct ua_frame { struct ua_frame {
__u8 caddr; __u8 caddr;
__u8 control; __u8 control;
__le32 saddr; /* Source device address */ __le32 saddr; /* Source device address */
__le32 daddr; /* Dest device address */ __le32 daddr; /* Dest device address */
} IRDA_PACK; } __packed;
struct dm_frame { struct dm_frame {
__u8 caddr; /* Connection address */ __u8 caddr; /* Connection address */
__u8 control; __u8 control;
} IRDA_PACK; } __packed;
struct rd_frame { struct rd_frame {
__u8 caddr; /* Connection address */ __u8 caddr; /* Connection address */
__u8 control; __u8 control;
} IRDA_PACK; } __packed;
struct rr_frame { struct rr_frame {
__u8 caddr; /* Connection address */ __u8 caddr; /* Connection address */
__u8 control; __u8 control;
} IRDA_PACK; } __packed;
struct i_frame { struct i_frame {
__u8 caddr; __u8 caddr;
__u8 control; __u8 control;
} IRDA_PACK; } __packed;
struct snrm_frame { struct snrm_frame {
__u8 caddr; __u8 caddr;
...@@ -138,7 +138,7 @@ struct snrm_frame { ...@@ -138,7 +138,7 @@ struct snrm_frame {
__le32 saddr; __le32 saddr;
__le32 daddr; __le32 daddr;
__u8 ncaddr; __u8 ncaddr;
} IRDA_PACK; } __packed;
void irlap_queue_xmit(struct irlap_cb *self, struct sk_buff *skb); void irlap_queue_xmit(struct irlap_cb *self, struct sk_buff *skb);
void irlap_send_discovery_xid_frame(struct irlap_cb *, int S, __u8 s, void irlap_send_discovery_xid_frame(struct irlap_cb *, int S, __u8 s,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment