Skip to content

Commit

Permalink
irda: Use __packed annotation instead IRDA_PACKED macro
Browse files Browse the repository at this point in the history
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: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Gustavo F. Padovan authored and David S. Miller committed Jul 21, 2010
1 parent 2e4e7a9 commit 942875f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
4 changes: 0 additions & 4 deletions include/net/irda/irda.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ typedef __u32 magic_t;
#ifndef IRDA_ALIGN
# define IRDA_ALIGN __attribute__((aligned))
#endif
#ifndef IRDA_PACK
# define IRDA_PACK __attribute__((packed))
#endif


#ifdef CONFIG_IRDA_DEBUG

Expand Down
18 changes: 9 additions & 9 deletions include/net/irda/irlap_frame.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ struct discovery_t;
struct disc_frame {
__u8 caddr; /* Connection address */
__u8 control;
} IRDA_PACK;
} __packed;

struct xid_frame {
__u8 caddr; /* Connection address */
Expand All @@ -96,49 +96,49 @@ struct xid_frame {
__u8 flags; /* Discovery flags */
__u8 slotnr;
__u8 version;
} IRDA_PACK;
} __packed;

struct test_frame {
__u8 caddr; /* Connection address */
__u8 control;
__le32 saddr; /* Source device address */
__le32 daddr; /* Destination device address */
} IRDA_PACK;
} __packed;

struct ua_frame {
__u8 caddr;
__u8 control;
__le32 saddr; /* Source device address */
__le32 daddr; /* Dest device address */
} IRDA_PACK;
} __packed;

struct dm_frame {
__u8 caddr; /* Connection address */
__u8 control;
} IRDA_PACK;
} __packed;

struct rd_frame {
__u8 caddr; /* Connection address */
__u8 control;
} IRDA_PACK;
} __packed;

struct rr_frame {
__u8 caddr; /* Connection address */
__u8 control;
} IRDA_PACK;
} __packed;

struct i_frame {
__u8 caddr;
__u8 control;
} IRDA_PACK;
} __packed;

struct snrm_frame {
__u8 caddr;
__u8 control;
__le32 saddr;
__le32 daddr;
__u8 ncaddr;
} IRDA_PACK;
} __packed;

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,
Expand Down

0 comments on commit 942875f

Please sign in to comment.