*Support for Atmel 'Router Under Mac' (RUM) in Jackdaw

core/net/uip.h

@@ -47,7 +47,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip.h,v 1.20 2008/10/15 08:56:44 adamdunkels Exp $
+ * $Id: uip.h,v 1.21 2008/12/10 21:26:05 c_oflynn Exp $
  *
  */
 
@@ -80,7 +80,7 @@ typedef uip_ip4addr_t uip_ipaddr_t;
 
 
 /*---------------------------------------------------------------------------*/
-
+
 /** \brief 64 bit 802.15.4 address */
 struct uip_802154_shortaddr {
   u8_t addr[2];
@@ -88,18 +88,18 @@ struct uip_802154_shortaddr {
 /** \brief 16 bit 802.15.4 address */
 struct uip_802154_longaddr {
   u8_t addr[8];
-};
-
-/** \brief 802.11 address */
+};
+
+/** \brief 802.11 address */
 struct uip_80211_addr {
   u8_t addr[6];
-};
-
-/** \brief 802.3 address */
+};
+
+/** \brief 802.3 address */
 struct uip_eth_addr {
   u8_t addr[6];
-};
-
+};
+
 #if UIP_CONF_LL_802154
 /** \brief 802.15.4 address */
 typedef struct uip_802154_longaddr uip_lladdr_t;
@@ -1405,7 +1405,7 @@ struct uip_stats {
     uip_stats_t sent;     /**< Number of sent ICMP packets. */
     uip_stats_t drop;     /**< Number of dropped ICMP packets. */
     uip_stats_t typeerr;  /**< Number of ICMP packets with a wrong
-			     type. */
+			     type. */
     uip_stats_t chkerr;   /**< Number of ICMP packets with a bad
 			     checksum. */
   } icmp;                 /**< ICMP statistics. */
@@ -1997,6 +1997,18 @@ CCIF extern uip_lladdr_t uip_lladdr;
    (((a)->u8[13]) == (m)->addr[5]) &&            \
    (((a)->u8[14]) == (m)->addr[6]) &&            \
    (((a)->u8[15]) == (m)->addr[7]))
+#else
+
+#define uip_is_addr_mac_addr_based(a, m) \
+  ((((a)->u8[8])  == (((m)->addr[0]) | 0x02)) &&   \
+   (((a)->u8[9])  == (m)->addr[1]) &&            \
+   (((a)->u8[10]) == (m)->addr[2]) &&            \
+   (((a)->u8[11]) == 0xff) &&            \
+   (((a)->u8[12]) == 0xfe) &&            \
+   (((a)->u8[13]) == (m)->addr[3]) &&            \
+   (((a)->u8[14]) == (m)->addr[4]) &&            \
+   (((a)->u8[15]) == (m)->addr[5]))
+   
 #endif /*UIP_CONF_LL_802154*/
 
 /**