2 files changed, 14 insertions, 18 deletions
diff --git a/firmware/x300/x300/x300_defs.h b/firmware/x300/x300/x300_defs.h
index 02c3d4808..65c5d5a23 100644
--- a/firmware/x300/x300/x300_defs.h
+++ b/firmware/x300/x300/x300_defs.h
@@ -1,10 +1,10 @@
 
-// Copyright 2012 Ettus Research LLC
+// Copyright 2014 Ettus Research LLC
 
-#ifndef INCLUDED_B250_DEFS_H
-#define INCLUDED_B250_DEFS_H
+#ifndef INCLUDED_X300_DEFS_H
+#define INCLUDED_X300_DEFS_H
 
-#define CPU_CLOCK 175000000
+#define CPU_CLOCK 166666667
 #define MAIN_RAM_BASE 0x0000
 #define PKT_RAM0_BASE 0x8000
 #define XGE0_BASE 0xC000
@@ -72,4 +72,4 @@ static const int BL_DATA        = 1;
 #define ETH_FRAMER_DST_UDP_MAC 6
 #define ETH_FRAMER_DST_MAC_LO 7
 
-#endif /* INCLUDED_B250_DEFS_H */
+#endif /* INCLUDED_X300_DEFS_H */
diff --git a/firmware/x300/x300/x300_main.c b/firmware/x300/x300/x300_main.c
index 809f181ba..d7fd32ac3 100644
--- a/firmware/x300/x300/x300_main.c
+++ b/firmware/x300/x300/x300_main.c
@@ -377,20 +377,16 @@ static void update_forwarding(const uint8_t e)
      * packets can be forwarded.  If one of the Ethernet interfaces is not
      * connected, data backs up until the first interface becomes unresponsive.
      *
-     * And for more fun, we had to re-enable forwarding of packets that were not
-     * addressed to this device's MAC address to work around an issue that was
-     * causing sequence errors.
+     * //update forwarding rules
+     * uint32_t forward = 0;
+     * if (!link_state_route_proto_causes_cycle_cached(e, (e+1)%2))
+     * {
+     *     forward |= (1 << 0); //forward bcast
+     *     forward |= (1 << 1); //forward not mac dest
+     * }
+     * const uint32_t eth_base = (e == 0)? SR_ETHINT0 : SR_ETHINT1;
+     * wb_poke32(SR_ADDR(SET0_BASE, eth_base + 8 + 4), forward);
      */
-    //update forwarding rules
-    uint32_t forward = 0;
-    if (!link_state_route_proto_causes_cycle_cached(e, (e+1)%2))
-    {
-        //FIXME: Uncomment when forwarding of broadcasts is properly handled
-        //forward |= (1 << 0); //forward bcast
-        forward |= (1 << 1); //forward not mac dest
-    }
-    const uint32_t eth_base = (e == 0)? SR_ETHINT0 : SR_ETHINT1;
-    wb_poke32(SR_ADDR(SET0_BASE, eth_base + 8 + 4), forward);
 
 }