1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00

Merge pull request #2210 from Lotterleben/fix_sixlowpan_typos

fix typos in ip.h, mac.h, ndp.h and types.h
This commit is contained in:
Ludwig Ortmann 2014-12-17 12:32:35 +01:00
commit b8b50e8579
4 changed files with 15 additions and 15 deletions

View File

@ -313,7 +313,7 @@ static inline void ipv6_addr_set_all_nodes_addr(ipv6_addr_t *ipv6_addr)
static inline void ipv6_addr_set_solicited_node_addr(ipv6_addr_t *ipv6_addr_out, static inline void ipv6_addr_set_solicited_node_addr(ipv6_addr_t *ipv6_addr_out,
const ipv6_addr_t *ipv6_addr_in) const ipv6_addr_t *ipv6_addr_in)
{ {
/* copy only the last 24-bit of the ip-address that is beeing resolved */ /* copy only the last 24-bit of the ip-address that is being resolved */
ipv6_addr_out->uint32[0] = HTONL(0xff020000); ipv6_addr_out->uint32[0] = HTONL(0xff020000);
ipv6_addr_out->uint32[1] = 0; ipv6_addr_out->uint32[1] = 0;
ipv6_addr_out->uint32[2] = HTONL(1); ipv6_addr_out->uint32[2] = HTONL(1);
@ -520,18 +520,18 @@ int ipv6_net_if_add_addr(int if_id, const ipv6_addr_t *addr,
* is no suitable address attached to the interface. * is no suitable address attached to the interface.
* *
* @param[out] src The best source address for this node (may be * @param[out] src The best source address for this node (may be
* all zero if ther is none). * all zero if there is none).
* @param[in] dest The destination address for a packet we search * @param[in] dest The destination address for a packet we search
* the source address for. * the source address for.
*/ */
void ipv6_net_if_get_best_src_addr(ipv6_addr_t *src, const ipv6_addr_t *dest); void ipv6_net_if_get_best_src_addr(ipv6_addr_t *src, const ipv6_addr_t *dest);
/** /**
* @brief Registers a function that decides how to route incomming * @brief Registers a function that decides how to route incoming
* IP packets with a destination that is not this interface. * IP packets with a destination that is not this interface.
* The default behaviour is to try forwarding such packets to * The default behavior is to try forwarding such packets to
* the neighborhood. * the neighborhood.
* Register a function to change the default behaviour. * Register a function to change the default behavior.
* Such function shall return the next hop to reach the destination * Such function shall return the next hop to reach the destination
* of the IP packet, or NULL if no such next hop is known. * of the IP packet, or NULL if no such next hop is known.
* In this case, the packet will be discarded. * In this case, the packet will be discarded.

View File

@ -44,7 +44,7 @@ extern "C" {
* *mcast* is 1). * *mcast* is 1).
* @param[in] dest The destination address of the frame (will be * @param[in] dest The destination address of the frame (will be
* ignored if *mcast* is 1). * ignored if *mcast* is 1).
* @param[in] dest_len The lengts of the destination address in byte. * @param[in] dest_len The lengths of the destination address in byte.
* @param[in] payload The payload of the frame. * @param[in] payload The payload of the frame.
* @param[in] length The length of the payload. * @param[in] length The length of the payload.
* @param[in] mcast send frame as multicast frame (*addr* and *if_id* * @param[in] mcast send frame as multicast frame (*addr* and *if_id*

View File

@ -78,11 +78,11 @@ typedef enum __attribute__((packed)) {
*/ */
typedef struct __attribute__((packed)) ndp_prefix_info_t { typedef struct __attribute__((packed)) ndp_prefix_info_t {
/** /**
* @brief The next on the interface. Intialise with NULL * @brief The next on the interface. Initialize with NULL
*/ */
struct ndp_prefix_info_t *addr_next; struct ndp_prefix_info_t *addr_next;
/** /**
* @brief The prev address on the interface. Initialise with NULL * @brief The prev address on the interface. Initialize with NULL
*/ */
struct ndp_prefix_info_t *addr_prev; struct ndp_prefix_info_t *addr_prev;
/** /**

View File

@ -34,15 +34,15 @@ extern "C" {
* @brief Data type to represent an EUI-64. * @brief Data type to represent an EUI-64.
*/ */
typedef union __attribute__((packed)) { typedef union __attribute__((packed)) {
uint8_t uint8[8]; ///< devided by 8 8-bit words. uint8_t uint8[8]; ///< divided by 8 8-bit words.
uint16_t uint16[4]; ///< devided by 4 16-bit words. uint16_t uint16[4]; ///< divided by 4 16-bit words.
} ieee_802154_long_t; } ieee_802154_long_t;
/** /**
* @brief Data type to represent IEEE 802.15.4 short address. * @brief Data type to represent IEEE 802.15.4 short address.
*/ */
typedef union __attribute__((packed)) { typedef union __attribute__((packed)) {
uint8_t uint8[2]; ///< devided by 2 8-bit words. uint8_t uint8[2]; ///< divided by 2 8-bit words.
uint16_t uint16[1]; ///< as a 16-bit value. uint16_t uint16[1]; ///< as a 16-bit value.
} ieee_802154_short_t; } ieee_802154_short_t;
@ -50,9 +50,9 @@ typedef union __attribute__((packed)) {
* @brief Data type to represent an IPv6 address. * @brief Data type to represent an IPv6 address.
*/ */
typedef union __attribute__((packed)) { typedef union __attribute__((packed)) {
uint8_t uint8[16]; ///< devided by 16 8-bit words. uint8_t uint8[16]; ///< divided by 16 8-bit words.
uint16_t uint16[8]; ///< devided by 8 16-bit words. uint16_t uint16[8]; ///< divided by 8 16-bit words.
uint32_t uint32[4]; ///< devided by 4 32-bit words. uint32_t uint32[4]; ///< divided by 4 32-bit words.
} ipv6_addr_t; } ipv6_addr_t;
/** /**
@ -85,7 +85,7 @@ typedef struct __attribute__((packed)) {
uint8_t routing_type; /**< identify srh-variant. */ uint8_t routing_type; /**< identify srh-variant. */
uint8_t segments_left; /**< remaining route segments before reaching destination. */ uint8_t segments_left; /**< remaining route segments before reaching destination. */
unsigned int cmpri:4, cmpre:4; /**< 4+4 bit, expressing prefix octets from each/last segment. */ unsigned int cmpri:4, cmpre:4; /**< 4+4 bit, expressing prefix octets from each/last segment. */
unsigned pad :4; /**< number of octets used for padding after adresses. */ unsigned pad :4; /**< number of octets used for padding after addresses. */
unsigned reserved :10; /**< reserved. Set to 0. */ unsigned reserved :10; /**< reserved. Set to 0. */
unsigned reserved2 :10; /**< reserved. Set to 0. */ unsigned reserved2 :10; /**< reserved. Set to 0. */
ipv6_addr_t route[]; ipv6_addr_t route[];