[IPV4]: struct ip_options annotations

[linux-2.6] / include / net / inet_sock.h

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 1f4a9a60d4cc472bf521967995e92848ff9e3b1f..3c19dbf302114ea0cc4cb66522309368e0614243 100644 (file)
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -27,7 +27,6 @@
 /** struct ip_options - IP Options
  *
  * @faddr - Saved first hop address
- * @is_setbyuser - Set by setsockopt?
  * @is_data - Options in __data, rather than skb
  * @is_strictroute - Strict source route
  * @srr_is_hit - Packet destination addr was our one
@@ -37,13 +36,12 @@
  * @ts_needaddr - Need to record addr of outgoing dev
  */
 struct ip_options {
-       __u32           faddr;
+       __be32          faddr;
        unsigned char   optlen;
        unsigned char   srr;
        unsigned char   rr;
        unsigned char   ts;
-       unsigned char   is_setbyuser:1,
-                       is_data:1,
+       unsigned char   is_data:1,
                        is_strictroute:1,
                        srr_is_hit:1,
                        is_changed:1,
@@ -51,7 +49,7 @@ struct ip_options {
                        ts_needtime:1,
                        ts_needaddr:1;
        unsigned char   router_alert;
-       unsigned char   __pad1;
+       unsigned char   cipso;
        unsigned char   __pad2;
        unsigned char   __data[0];
 };
@@ -64,8 +62,8 @@ struct inet_request_sock {
        u16                     inet6_rsk_offset;
        /* 2 bytes hole, try to pack */
 #endif
-       u32                     loc_addr;
-       u32                     rmt_addr;
+       __be32                  loc_addr;
+       __be32                  rmt_addr;
        u16                     rmt_port;
        u16                     snd_wscale : 4, 
                                rcv_wscale : 4, 
@@ -112,11 +110,11 @@ struct inet_sock {
        struct ipv6_pinfo       *pinet6;
 #endif
        /* Socket demultiplex comparisons on incoming packets. */
-       __u32                   daddr;
-       __u32                   rcv_saddr;
+       __be32                  daddr;
+       __be32                  rcv_saddr;
        __u16                   dport;
        __u16                   num;
-       __u32                   saddr;
+       __be32                  saddr;
        __s16                   uc_ttl;
        __u16                   cmsg_flags;
        struct ip_options       *opt;
@@ -131,7 +129,7 @@ struct inet_sock {
                                hdrincl:1,
                                mc_loop:1;
        int                     mc_index;
-       __u32                   mc_addr;
+       __be32                  mc_addr;
        struct ip_mc_socklist   *mc_list;
        struct {
                unsigned int            flags;
@@ -139,7 +137,7 @@ struct inet_sock {
                struct ip_options       *opt;
                struct rtable           *rt;
                int                     length; /* Total length of all frames */
-               u32                     addr;
+               __be32                  addr;
                struct flowi            fl;
        } cork;
 };