Changeset fdbc3ff in mainline for uspace/lib/net/include/ip_header.h


Ignore:
Timestamp:
2010-11-19T23:50:06Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
46d4d9f
Parents:
b4c9c61 (diff), a9c6b966 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/net/include/ip_header.h

    rb4c9c61 rfdbc3ff  
    127127typedef struct ip_header ip_header_t;
    128128
    129 /** Type definition of the internet header pointer.
    130  * @see ip_header
    131  */
    132 typedef ip_header_t *ip_header_ref;
    133 
    134129/** Type definition of the internet option header.
    135130 * @see ip_header
     
    137132typedef struct ip_option ip_option_t;
    138133
    139 /** Type definition of the internet option header pointer.
    140  * @see ip_header
    141  */
    142 typedef ip_option_t *ip_option_ref;
    143 
    144134/** Type definition of the internet version 4 pseudo header.
    145135 * @see ipv4_pseudo_header
    146136 */
    147137typedef struct ipv4_pseudo_header ipv4_pseudo_header_t;
    148 
    149 /** Type definition of the internet version 4 pseudo header pointer.
    150  * @see ipv4_pseudo_header
    151  */
    152 typedef ipv4_pseudo_header_t *ipv4_pseudo_header_ref;
    153138
    154139/** Internet header.
Note: See TracChangeset for help on using the changeset viewer.