diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-03-24 13:34:05 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-04-01 15:52:19 -0700 |
| commit | 5de1bb5cc9eb5b52c095a02d8afe68bc34ae0523 (patch) | |
| tree | 6b3d8e477c9aae2d457b61fd05d6cea284d3f6af /lib/packets.h | |
| parent | 7feba1acdd806b54ec152d2e93169ab2a295128d (diff) | |
packets: New function snap_compose(); rename compose_packet() for consistency.
The following commit will introduce the first use of snap_compose().
Diffstat (limited to 'lib/packets.h')
| -rw-r--r-- | lib/packets.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/packets.h b/lib/packets.h index 44cd5a73..42d225c2 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -394,10 +394,12 @@ struct in6_addr ipv6_create_mask(int mask); int ipv6_count_cidr_bits(const struct in6_addr *netmask); bool ipv6_is_cidr(const struct in6_addr *netmask); -void * -compose_packet(struct ofpbuf *, const uint8_t eth_dst[ETH_ADDR_LEN], - const uint8_t eth_src[ETH_ADDR_LEN], uint16_t eth_type, - size_t size); +void *eth_compose(struct ofpbuf *, const uint8_t eth_dst[ETH_ADDR_LEN], + const uint8_t eth_src[ETH_ADDR_LEN], uint16_t eth_type, + size_t size); +void *snap_compose(struct ofpbuf *, const uint8_t eth_dst[ETH_ADDR_LEN], + const uint8_t eth_src[ETH_ADDR_LEN], + unsigned int oui, uint16_t snap_type, size_t size); /* Masks for lacp_info state member. */ #define LACP_STATE_ACT 0x01 /* Activity. Active or passive? */ |