diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-03 06:21:52 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-03 06:21:52 -0400 |
commit | bc10502dba37d3b210efd9f3867212298f13b78e (patch) | |
tree | af4542eaab79cd509244578f839167f16f3ab02d /net | |
parent | ba2d3587912f82d1ab4367975b1df460db60fb1e (diff) |
net: use __packed annotation
cleanup patch.
Use new __packed annotation in net/ and include/
(except netfilter)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/bnep/bnep.h | 8 | ||||
-rw-r--r-- | net/compat.c | 6 | ||||
-rw-r--r-- | net/iucv/iucv.c | 14 | ||||
-rw-r--r-- | net/mac80211/cfg.c | 2 | ||||
-rw-r--r-- | net/mac80211/ieee80211_i.h | 2 | ||||
-rw-r--r-- | net/mac80211/rx.c | 2 | ||||
-rw-r--r-- | net/sctp/sm_make_chunk.c | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/net/bluetooth/bnep/bnep.h b/net/bluetooth/bnep/bnep.h index 0d9e506f5d5a..70672544db86 100644 --- a/net/bluetooth/bnep/bnep.h +++ b/net/bluetooth/bnep/bnep.h | |||
@@ -86,26 +86,26 @@ struct bnep_setup_conn_req { | |||
86 | __u8 ctrl; | 86 | __u8 ctrl; |
87 | __u8 uuid_size; | 87 | __u8 uuid_size; |
88 | __u8 service[0]; | 88 | __u8 service[0]; |
89 | } __attribute__((packed)); | 89 | } __packed; |
90 | 90 | ||
91 | struct bnep_set_filter_req { | 91 | struct bnep_set_filter_req { |
92 | __u8 type; | 92 | __u8 type; |
93 | __u8 ctrl; | 93 | __u8 ctrl; |
94 | __be16 len; | 94 | __be16 len; |
95 | __u8 list[0]; | 95 | __u8 list[0]; |
96 | } __attribute__((packed)); | 96 | } __packed; |
97 | 97 | ||
98 | struct bnep_control_rsp { | 98 | struct bnep_control_rsp { |
99 | __u8 type; | 99 | __u8 type; |
100 | __u8 ctrl; | 100 | __u8 ctrl; |
101 | __be16 resp; | 101 | __be16 resp; |
102 | } __attribute__((packed)); | 102 | } __packed; |
103 | 103 | ||
104 | struct bnep_ext_hdr { | 104 | struct bnep_ext_hdr { |
105 | __u8 type; | 105 | __u8 type; |
106 | __u8 len; | 106 | __u8 len; |
107 | __u8 data[0]; | 107 | __u8 data[0]; |
108 | } __attribute__((packed)); | 108 | } __packed; |
109 | 109 | ||
110 | /* BNEP ioctl defines */ | 110 | /* BNEP ioctl defines */ |
111 | #define BNEPCONNADD _IOW('B', 200, int) | 111 | #define BNEPCONNADD _IOW('B', 200, int) |
diff --git a/net/compat.c b/net/compat.c index ec24d9edb025..1cf75905f132 100644 --- a/net/compat.c +++ b/net/compat.c | |||
@@ -531,7 +531,7 @@ struct compat_group_req { | |||
531 | __u32 gr_interface; | 531 | __u32 gr_interface; |
532 | struct __kernel_sockaddr_storage gr_group | 532 | struct __kernel_sockaddr_storage gr_group |
533 | __attribute__ ((aligned(4))); | 533 | __attribute__ ((aligned(4))); |
534 | } __attribute__ ((packed)); | 534 | } __packed; |
535 | 535 | ||
536 | struct compat_group_source_req { | 536 | struct compat_group_source_req { |
537 | __u32 gsr_interface; | 537 | __u32 gsr_interface; |
@@ -539,7 +539,7 @@ struct compat_group_source_req { | |||
539 | __attribute__ ((aligned(4))); | 539 | __attribute__ ((aligned(4))); |
540 | struct __kernel_sockaddr_storage gsr_source | 540 | struct __kernel_sockaddr_storage gsr_source |
541 | __attribute__ ((aligned(4))); | 541 | __attribute__ ((aligned(4))); |
542 | } __attribute__ ((packed)); | 542 | } __packed; |
543 | 543 | ||
544 | struct compat_group_filter { | 544 | struct compat_group_filter { |
545 | __u32 gf_interface; | 545 | __u32 gf_interface; |
@@ -549,7 +549,7 @@ struct compat_group_filter { | |||
549 | __u32 gf_numsrc; | 549 | __u32 gf_numsrc; |
550 | struct __kernel_sockaddr_storage gf_slist[1] | 550 | struct __kernel_sockaddr_storage gf_slist[1] |
551 | __attribute__ ((aligned(4))); | 551 | __attribute__ ((aligned(4))); |
552 | } __attribute__ ((packed)); | 552 | } __packed; |
553 | 553 | ||
554 | #define __COMPAT_GF0_SIZE (sizeof(struct compat_group_filter) - \ | 554 | #define __COMPAT_GF0_SIZE (sizeof(struct compat_group_filter) - \ |
555 | sizeof(struct __kernel_sockaddr_storage)) | 555 | sizeof(struct __kernel_sockaddr_storage)) |
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index f28ad2cc8428..499c045d6910 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c | |||
@@ -1463,7 +1463,7 @@ struct iucv_path_pending { | |||
1463 | u32 res3; | 1463 | u32 res3; |
1464 | u8 ippollfg; | 1464 | u8 ippollfg; |
1465 | u8 res4[3]; | 1465 | u8 res4[3]; |
1466 | } __attribute__ ((packed)); | 1466 | } __packed; |
1467 | 1467 | ||
1468 | static void iucv_path_pending(struct iucv_irq_data *data) | 1468 | static void iucv_path_pending(struct iucv_irq_data *data) |
1469 | { | 1469 | { |
@@ -1524,7 +1524,7 @@ struct iucv_path_complete { | |||
1524 | u32 res3; | 1524 | u32 res3; |
1525 | u8 ippollfg; | 1525 | u8 ippollfg; |
1526 | u8 res4[3]; | 1526 | u8 res4[3]; |
1527 | } __attribute__ ((packed)); | 1527 | } __packed; |
1528 | 1528 | ||
1529 | static void iucv_path_complete(struct iucv_irq_data *data) | 1529 | static void iucv_path_complete(struct iucv_irq_data *data) |
1530 | { | 1530 | { |
@@ -1554,7 +1554,7 @@ struct iucv_path_severed { | |||
1554 | u32 res4; | 1554 | u32 res4; |
1555 | u8 ippollfg; | 1555 | u8 ippollfg; |
1556 | u8 res5[3]; | 1556 | u8 res5[3]; |
1557 | } __attribute__ ((packed)); | 1557 | } __packed; |
1558 | 1558 | ||
1559 | static void iucv_path_severed(struct iucv_irq_data *data) | 1559 | static void iucv_path_severed(struct iucv_irq_data *data) |
1560 | { | 1560 | { |
@@ -1590,7 +1590,7 @@ struct iucv_path_quiesced { | |||
1590 | u32 res4; | 1590 | u32 res4; |
1591 | u8 ippollfg; | 1591 | u8 ippollfg; |
1592 | u8 res5[3]; | 1592 | u8 res5[3]; |
1593 | } __attribute__ ((packed)); | 1593 | } __packed; |
1594 | 1594 | ||
1595 | static void iucv_path_quiesced(struct iucv_irq_data *data) | 1595 | static void iucv_path_quiesced(struct iucv_irq_data *data) |
1596 | { | 1596 | { |
@@ -1618,7 +1618,7 @@ struct iucv_path_resumed { | |||
1618 | u32 res4; | 1618 | u32 res4; |
1619 | u8 ippollfg; | 1619 | u8 ippollfg; |
1620 | u8 res5[3]; | 1620 | u8 res5[3]; |
1621 | } __attribute__ ((packed)); | 1621 | } __packed; |
1622 | 1622 | ||
1623 | static void iucv_path_resumed(struct iucv_irq_data *data) | 1623 | static void iucv_path_resumed(struct iucv_irq_data *data) |
1624 | { | 1624 | { |
@@ -1649,7 +1649,7 @@ struct iucv_message_complete { | |||
1649 | u32 ipbfln2f; | 1649 | u32 ipbfln2f; |
1650 | u8 ippollfg; | 1650 | u8 ippollfg; |
1651 | u8 res2[3]; | 1651 | u8 res2[3]; |
1652 | } __attribute__ ((packed)); | 1652 | } __packed; |
1653 | 1653 | ||
1654 | static void iucv_message_complete(struct iucv_irq_data *data) | 1654 | static void iucv_message_complete(struct iucv_irq_data *data) |
1655 | { | 1655 | { |
@@ -1694,7 +1694,7 @@ struct iucv_message_pending { | |||
1694 | u32 ipbfln2f; | 1694 | u32 ipbfln2f; |
1695 | u8 ippollfg; | 1695 | u8 ippollfg; |
1696 | u8 res2[3]; | 1696 | u8 res2[3]; |
1697 | } __attribute__ ((packed)); | 1697 | } __packed; |
1698 | 1698 | ||
1699 | static void iucv_message_pending(struct iucv_irq_data *data) | 1699 | static void iucv_message_pending(struct iucv_irq_data *data) |
1700 | { | 1700 | { |
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index c7000a6ca379..a2ed0f7b5568 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -600,7 +600,7 @@ struct iapp_layer2_update { | |||
600 | u8 ssap; /* 0 */ | 600 | u8 ssap; /* 0 */ |
601 | u8 control; | 601 | u8 control; |
602 | u8 xid_info[3]; | 602 | u8 xid_info[3]; |
603 | } __attribute__ ((packed)); | 603 | } __packed; |
604 | 604 | ||
605 | static void ieee80211_send_layer2_update(struct sta_info *sta) | 605 | static void ieee80211_send_layer2_update(struct sta_info *sta) |
606 | { | 606 | { |
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 1a9e2da37a93..ec3e5c3e27bd 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -1084,7 +1084,7 @@ struct ieee80211_tx_status_rtap_hdr { | |||
1084 | u8 padding_for_rate; | 1084 | u8 padding_for_rate; |
1085 | __le16 tx_flags; | 1085 | __le16 tx_flags; |
1086 | u8 data_retries; | 1086 | u8 data_retries; |
1087 | } __attribute__ ((packed)); | 1087 | } __packed; |
1088 | 1088 | ||
1089 | 1089 | ||
1090 | /* HT */ | 1090 | /* HT */ |
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 6e2a7bcd8cb8..2d9a2ee94e17 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -2139,7 +2139,7 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx, | |||
2139 | u8 rate_or_pad; | 2139 | u8 rate_or_pad; |
2140 | __le16 chan_freq; | 2140 | __le16 chan_freq; |
2141 | __le16 chan_flags; | 2141 | __le16 chan_flags; |
2142 | } __attribute__ ((packed)) *rthdr; | 2142 | } __packed *rthdr; |
2143 | struct sk_buff *skb = rx->skb, *skb2; | 2143 | struct sk_buff *skb = rx->skb, *skb2; |
2144 | struct net_device *prev_dev = NULL; | 2144 | struct net_device *prev_dev = NULL; |
2145 | struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); | 2145 | struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); |
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index bd2a50b482ac..246f92924658 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c | |||
@@ -1817,7 +1817,7 @@ malformed: | |||
1817 | struct __sctp_missing { | 1817 | struct __sctp_missing { |
1818 | __be32 num_missing; | 1818 | __be32 num_missing; |
1819 | __be16 type; | 1819 | __be16 type; |
1820 | } __attribute__((packed)); | 1820 | } __packed; |
1821 | 1821 | ||
1822 | /* | 1822 | /* |
1823 | * Report a missing mandatory parameter. | 1823 | * Report a missing mandatory parameter. |