diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-14 23:47:46 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:22:48 -0500 |
commit | 448c31aa34b5ee947d322e8747c4cf801fc4c104 (patch) | |
tree | 8caa290c2d91d79863c4a1135b523334766020bb | |
parent | c68b907028d35b0ad5a98b5e5552f0ad56a9ba1d (diff) |
[IRDA]: Trivial annotations.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/irda/irlap_frame.h | 16 | ||||
-rw-r--r-- | net/irda/iriap.c | 8 | ||||
-rw-r--r-- | net/irda/irlan/irlan_common.c | 2 | ||||
-rw-r--r-- | net/irda/irttp.c | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/include/net/irda/irlap_frame.h b/include/net/irda/irlap_frame.h index 9dd54a5002b2..641f88e848bd 100644 --- a/include/net/irda/irlap_frame.h +++ b/include/net/irda/irlap_frame.h | |||
@@ -91,8 +91,8 @@ struct xid_frame { | |||
91 | __u8 caddr; /* Connection address */ | 91 | __u8 caddr; /* Connection address */ |
92 | __u8 control; | 92 | __u8 control; |
93 | __u8 ident; /* Should always be XID_FORMAT */ | 93 | __u8 ident; /* Should always be XID_FORMAT */ |
94 | __u32 saddr; /* Source device address */ | 94 | __le32 saddr; /* Source device address */ |
95 | __u32 daddr; /* Destination device address */ | 95 | __le32 daddr; /* Destination device address */ |
96 | __u8 flags; /* Discovery flags */ | 96 | __u8 flags; /* Discovery flags */ |
97 | __u8 slotnr; | 97 | __u8 slotnr; |
98 | __u8 version; | 98 | __u8 version; |
@@ -101,15 +101,15 @@ struct xid_frame { | |||
101 | struct test_frame { | 101 | struct test_frame { |
102 | __u8 caddr; /* Connection address */ | 102 | __u8 caddr; /* Connection address */ |
103 | __u8 control; | 103 | __u8 control; |
104 | __u32 saddr; /* Source device address */ | 104 | __le32 saddr; /* Source device address */ |
105 | __u32 daddr; /* Destination device address */ | 105 | __le32 daddr; /* Destination device address */ |
106 | } IRDA_PACK; | 106 | } IRDA_PACK; |
107 | 107 | ||
108 | struct ua_frame { | 108 | struct ua_frame { |
109 | __u8 caddr; | 109 | __u8 caddr; |
110 | __u8 control; | 110 | __u8 control; |
111 | __u32 saddr; /* Source device address */ | 111 | __le32 saddr; /* Source device address */ |
112 | __u32 daddr; /* Dest device address */ | 112 | __le32 daddr; /* Dest device address */ |
113 | } IRDA_PACK; | 113 | } IRDA_PACK; |
114 | 114 | ||
115 | struct dm_frame { | 115 | struct dm_frame { |
@@ -135,8 +135,8 @@ struct i_frame { | |||
135 | struct snrm_frame { | 135 | struct snrm_frame { |
136 | __u8 caddr; | 136 | __u8 caddr; |
137 | __u8 control; | 137 | __u8 control; |
138 | __u32 saddr; | 138 | __le32 saddr; |
139 | __u32 daddr; | 139 | __le32 daddr; |
140 | __u8 ncaddr; | 140 | __u8 ncaddr; |
141 | } IRDA_PACK; | 141 | } IRDA_PACK; |
142 | 142 | ||
diff --git a/net/irda/iriap.c b/net/irda/iriap.c index 415cf4eec23b..ab86d70393ea 100644 --- a/net/irda/iriap.c +++ b/net/irda/iriap.c | |||
@@ -451,12 +451,12 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self, | |||
451 | n = 2; | 451 | n = 2; |
452 | 452 | ||
453 | /* Get length, MSB first */ | 453 | /* Get length, MSB first */ |
454 | len = be16_to_cpu(get_unaligned((__u16 *)(fp+n))); n += 2; | 454 | len = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); n += 2; |
455 | 455 | ||
456 | IRDA_DEBUG(4, "%s(), len=%d\n", __FUNCTION__, len); | 456 | IRDA_DEBUG(4, "%s(), len=%d\n", __FUNCTION__, len); |
457 | 457 | ||
458 | /* Get object ID, MSB first */ | 458 | /* Get object ID, MSB first */ |
459 | obj_id = be16_to_cpu(get_unaligned((__u16 *)(fp+n))); n += 2; | 459 | obj_id = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); n += 2; |
460 | 460 | ||
461 | type = fp[n++]; | 461 | type = fp[n++]; |
462 | IRDA_DEBUG(4, "%s(), Value type = %d\n", __FUNCTION__, type); | 462 | IRDA_DEBUG(4, "%s(), Value type = %d\n", __FUNCTION__, type); |
@@ -506,7 +506,7 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self, | |||
506 | value = irias_new_string_value(fp+n); | 506 | value = irias_new_string_value(fp+n); |
507 | break; | 507 | break; |
508 | case IAS_OCT_SEQ: | 508 | case IAS_OCT_SEQ: |
509 | value_len = be16_to_cpu(get_unaligned((__u16 *)(fp+n))); | 509 | value_len = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); |
510 | n += 2; | 510 | n += 2; |
511 | 511 | ||
512 | /* Will truncate to IAS_MAX_OCTET_STRING bytes */ | 512 | /* Will truncate to IAS_MAX_OCTET_STRING bytes */ |
@@ -544,7 +544,7 @@ static void iriap_getvaluebyclass_response(struct iriap_cb *self, | |||
544 | { | 544 | { |
545 | struct sk_buff *tx_skb; | 545 | struct sk_buff *tx_skb; |
546 | int n; | 546 | int n; |
547 | __u32 tmp_be32; | 547 | __be32 tmp_be32; |
548 | __be16 tmp_be16; | 548 | __be16 tmp_be16; |
549 | __u8 *fp; | 549 | __u8 *fp; |
550 | 550 | ||
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c index 9b962f247714..2bb04ac09329 100644 --- a/net/irda/irlan/irlan_common.c +++ b/net/irda/irlan/irlan_common.c | |||
@@ -995,7 +995,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type, | |||
995 | { | 995 | { |
996 | __u8 *frame; | 996 | __u8 *frame; |
997 | __u8 param_len; | 997 | __u8 param_len; |
998 | __u16 tmp_le; /* Temporary value in little endian format */ | 998 | __le16 tmp_le; /* Temporary value in little endian format */ |
999 | int n=0; | 999 | int n=0; |
1000 | 1000 | ||
1001 | if (skb == NULL) { | 1001 | if (skb == NULL) { |
diff --git a/net/irda/irttp.c b/net/irda/irttp.c index 3c2e70b77df1..9c446a72ff1f 100644 --- a/net/irda/irttp.c +++ b/net/irda/irttp.c | |||
@@ -1147,7 +1147,7 @@ int irttp_connect_request(struct tsap_cb *self, __u8 dtsap_sel, | |||
1147 | frame[3] = 0x02; /* Value length */ | 1147 | frame[3] = 0x02; /* Value length */ |
1148 | 1148 | ||
1149 | put_unaligned(cpu_to_be16((__u16) max_sdu_size), | 1149 | put_unaligned(cpu_to_be16((__u16) max_sdu_size), |
1150 | (__u16 *)(frame+4)); | 1150 | (__be16 *)(frame+4)); |
1151 | } else { | 1151 | } else { |
1152 | /* Insert plain TTP header */ | 1152 | /* Insert plain TTP header */ |
1153 | frame = skb_push(tx_skb, TTP_HEADER); | 1153 | frame = skb_push(tx_skb, TTP_HEADER); |
@@ -1394,7 +1394,7 @@ int irttp_connect_response(struct tsap_cb *self, __u32 max_sdu_size, | |||
1394 | frame[3] = 0x02; /* Value length */ | 1394 | frame[3] = 0x02; /* Value length */ |
1395 | 1395 | ||
1396 | put_unaligned(cpu_to_be16((__u16) max_sdu_size), | 1396 | put_unaligned(cpu_to_be16((__u16) max_sdu_size), |
1397 | (__u16 *)(frame+4)); | 1397 | (__be16 *)(frame+4)); |
1398 | } else { | 1398 | } else { |
1399 | /* Insert TTP header */ | 1399 | /* Insert TTP header */ |
1400 | frame = skb_push(tx_skb, TTP_HEADER); | 1400 | frame = skb_push(tx_skb, TTP_HEADER); |