Changeset 3a0a4d8 in mainline for uspace/srv/net/inetsrv/inet_std.h


Ignore:
Timestamp:
2013-09-12T07:54:05Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
95027b5
Parents:
47f5a77 (diff), 64f3d3b (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/srv/net/inetsrv/inet_std.h

    r47f5a77 r3a0a4d8  
    3939
    4040#include <sys/types.h>
     41
     42#define IP6_NEXT_FRAGMENT  44
    4143
    4244/** IPv4 Datagram header (fixed part) */
    … …  
    9092};
    9193
    92 /** Bits in ip6_frag_header_t.offsmf */
     94/** Bits in ip6_header_fragment_t.offsmf */
    9395enum flags_offsmt_bits {
    9496        /** More fragments */
Note: See TracChangeset for help on using the changeset viewer.