[IRDA]: Trivial annotations.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/irda/irlap_frame.h b/include/net/irda/irlap_frame.h
index 9dd54a5002b2af123c3118f09db60838cc05add0..641f88e848bd3d57ff446517afb1d596652ebf22 100644 (file)
--- a/include/net/irda/irlap_frame.h
+++ b/include/net/irda/irlap_frame.h
@@ -91,8 +91,8 @@ struct xid_frame {
        __u8  caddr; /* Connection address */
        __u8  control;
        __u8  ident; /* Should always be XID_FORMAT */ 
-       __u32 saddr; /* Source device address */
-       __u32 daddr; /* Destination device address */
+       __le32 saddr; /* Source device address */
+       __le32 daddr; /* Destination device address */
        __u8  flags; /* Discovery flags */
        __u8  slotnr;
        __u8  version;
@@ -101,15 +101,15 @@ struct xid_frame {
 struct test_frame {
        __u8 caddr;          /* Connection address */
        __u8 control;
-       __u32 saddr;         /* Source device address */
-       __u32 daddr;         /* Destination device address */
+       __le32 saddr;         /* Source device address */
+       __le32 daddr;         /* Destination device address */
 } IRDA_PACK;
 
 struct ua_frame {
        __u8 caddr;
        __u8 control;
-       __u32 saddr; /* Source device address */
-       __u32 daddr; /* Dest device address */
+       __le32 saddr; /* Source device address */
+       __le32 daddr; /* Dest device address */
 } IRDA_PACK;
 
 struct dm_frame {
@@ -135,8 +135,8 @@ struct i_frame {
 struct snrm_frame {
        __u8  caddr;
        __u8  control;
-       __u32 saddr;
-       __u32 daddr;
+       __le32 saddr;
+       __le32 daddr;
        __u8  ncaddr;
 } IRDA_PACK;
 

diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index 415cf4eec23b8e86ac69597dd0ffae6e3f953f44..ab86d70393ea4323faedd13da50f78aacca875ce 100644 (file)
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -451,12 +451,12 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
        n = 2;
 
        /* Get length, MSB first */
-       len = be16_to_cpu(get_unaligned((__u16 *)(fp+n))); n += 2;
+       len = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); n += 2;
 
        IRDA_DEBUG(4, "%s(), len=%d\n", __FUNCTION__, len);
 
        /* Get object ID, MSB first */
-       obj_id = be16_to_cpu(get_unaligned((__u16 *)(fp+n))); n += 2;
+       obj_id = be16_to_cpu(get_unaligned((__be16 *)(fp+n))); n += 2;
 
        type = fp[n++];
        IRDA_DEBUG(4, "%s(), Value type = %d\n", __FUNCTION__, type);
@@ -506,7 +506,7 @@ static void iriap_getvaluebyclass_confirm(struct iriap_cb *self,
                value = irias_new_string_value(fp+n);
                break;
        case IAS_OCT_SEQ:
-               value_len = be16_to_cpu(get_unaligned((__u16 *)(fp+n)));
+               value_len = be16_to_cpu(get_unaligned((__be16 *)(fp+n)));
                n += 2;
 
                /* Will truncate to IAS_MAX_OCTET_STRING bytes */
@@ -544,7 +544,7 @@ static void iriap_getvaluebyclass_response(struct iriap_cb *self,
 {
        struct sk_buff *tx_skb;
        int n;
-       __u32 tmp_be32;
+       __be32 tmp_be32;
        __be16 tmp_be16;
        __u8 *fp;
 

diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index 9b962f247714f5ec71c02f4b1e9822cd1531955e..2bb04ac0932922dd8e5042787fdacea795b5ec13 100644 (file)
--- 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,
 {
        __u8 *frame;
        __u8 param_len;
-       __u16 tmp_le; /* Temporary value in little endian format */
+       __le16 tmp_le; /* Temporary value in little endian format */
        int n=0;
        
        if (skb == NULL) {

diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index 3c2e70b77df16375952f1c0bc889f298a588e8a9..9c446a72ff1faa8125f7429501f484d284338445 100644 (file)
--- 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,
                frame[3] = 0x02; /* Value length */
 
                put_unaligned(cpu_to_be16((__u16) max_sdu_size),
-                             (__u16 *)(frame+4));
+                             (__be16 *)(frame+4));
        } else {
                /* Insert plain TTP header */
                frame = skb_push(tx_skb, TTP_HEADER);
@@ -1394,7 +1394,7 @@ int irttp_connect_response(struct tsap_cb *self, __u32 max_sdu_size,
                frame[3] = 0x02; /* Value length */
 
                put_unaligned(cpu_to_be16((__u16) max_sdu_size),
-                             (__u16 *)(frame+4));
+                             (__be16 *)(frame+4));
        } else {
                /* Insert TTP header */
                frame = skb_push(tx_skb, TTP_HEADER);