408 files changed, 177 insertions, 10 deletions

diff --git a/firmware/x300/.gitignore b/firmware/usrp2/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/firmware/x300/.gitignore
+++ b/firmware/usrp2/.gitignore
diff --git a/firmware/zpu/CMakeLists.txt b/firmware/usrp2/CMakeLists.txt
index 80fd074bd..80fd074bd 100644
--- a/firmware/zpu/CMakeLists.txt
+++ b/firmware/usrp2/CMakeLists.txt
diff --git a/firmware/zpu/apps/txrx_uhd.c b/firmware/usrp2/apps/txrx_uhd.c
index 30efc9518..30efc9518 100644
--- a/firmware/zpu/apps/txrx_uhd.c
+++ b/firmware/usrp2/apps/txrx_uhd.c
diff --git a/firmware/zpu/bin/bin_to_mif.py b/firmware/usrp2/bin/bin_to_mif.py
index cefce4e92..cefce4e92 100755
--- a/firmware/zpu/bin/bin_to_mif.py
+++ b/firmware/usrp2/bin/bin_to_mif.py
diff --git a/firmware/zpu/bin/bin_to_ram_macro_init.py b/firmware/usrp2/bin/bin_to_ram_macro_init.py
index bf8abb19a..bf8abb19a 100755
--- a/firmware/zpu/bin/bin_to_ram_macro_init.py
+++ b/firmware/usrp2/bin/bin_to_ram_macro_init.py
diff --git a/firmware/zpu/bin/divisors.py b/firmware/usrp2/bin/divisors.py
index d31bd4dad..d31bd4dad 100755
--- a/firmware/zpu/bin/divisors.py
+++ b/firmware/usrp2/bin/divisors.py
diff --git a/firmware/zpu/bin/elf_to_sbf b/firmware/usrp2/bin/elf_to_sbf
index d1be10c0d..d1be10c0d 100755
--- a/firmware/zpu/bin/elf_to_sbf
+++ b/firmware/usrp2/bin/elf_to_sbf
diff --git a/firmware/zpu/bin/sbf.py b/firmware/usrp2/bin/sbf.py
index 8e2c868a5..8e2c868a5 100755
--- a/firmware/zpu/bin/sbf.py
+++ b/firmware/usrp2/bin/sbf.py
diff --git a/firmware/zpu/bin/serial_loader b/firmware/usrp2/bin/serial_loader
index 9bd5aada7..9bd5aada7 100755
--- a/firmware/zpu/bin/serial_loader
+++ b/firmware/usrp2/bin/serial_loader
diff --git a/firmware/zpu/bin/uart_ihex_flash_loader.py b/firmware/usrp2/bin/uart_ihex_flash_loader.py
index 5a3300f34..5a3300f34 100755
--- a/firmware/zpu/bin/uart_ihex_flash_loader.py
+++ b/firmware/usrp2/bin/uart_ihex_flash_loader.py
diff --git a/firmware/zpu/bin/uart_ihex_ram_loader.py b/firmware/usrp2/bin/uart_ihex_ram_loader.py
index c90fbe1d8..c90fbe1d8 100755
--- a/firmware/zpu/bin/uart_ihex_ram_loader.py
+++ b/firmware/usrp2/bin/uart_ihex_ram_loader.py
diff --git a/firmware/zpu/lib/CMakeLists.txt b/firmware/usrp2/lib/CMakeLists.txt
index ce6b7fa44..ce6b7fa44 100644
--- a/firmware/zpu/lib/CMakeLists.txt
+++ b/firmware/usrp2/lib/CMakeLists.txt
diff --git a/firmware/zpu/lib/_exit.c b/firmware/usrp2/lib/_exit.c
index 9b40ab2ee..9b40ab2ee 100644
--- a/firmware/zpu/lib/_exit.c
+++ b/firmware/usrp2/lib/_exit.c
diff --git a/firmware/zpu/lib/abort.c b/firmware/usrp2/lib/abort.c
index d1d709392..d1d709392 100644
--- a/firmware/zpu/lib/abort.c
+++ b/firmware/usrp2/lib/abort.c
diff --git a/firmware/zpu/lib/ad9510.c b/firmware/usrp2/lib/ad9510.c
index 4021a9bf7..4021a9bf7 100644
--- a/firmware/zpu/lib/ad9510.c
+++ b/firmware/usrp2/lib/ad9510.c
diff --git a/firmware/zpu/lib/ad9510.h b/firmware/usrp2/lib/ad9510.h
index a395e5223..a395e5223 100644
--- a/firmware/zpu/lib/ad9510.h
+++ b/firmware/usrp2/lib/ad9510.h
diff --git a/firmware/zpu/lib/arp_cache.c b/firmware/usrp2/lib/arp_cache.c
index 8e14d8f17..8e14d8f17 100644
--- a/firmware/zpu/lib/arp_cache.c
+++ b/firmware/usrp2/lib/arp_cache.c
diff --git a/firmware/zpu/lib/arp_cache.h b/firmware/usrp2/lib/arp_cache.h
index e0e125d89..e0e125d89 100644
--- a/firmware/zpu/lib/arp_cache.h
+++ b/firmware/usrp2/lib/arp_cache.h
diff --git a/firmware/zpu/lib/banal.c b/firmware/usrp2/lib/banal.c
index dfb8df355..dfb8df355 100644
--- a/firmware/zpu/lib/banal.c
+++ b/firmware/usrp2/lib/banal.c
diff --git a/firmware/zpu/lib/banal.h b/firmware/usrp2/lib/banal.h
index e9e55bca5..e9e55bca5 100644
--- a/firmware/zpu/lib/banal.h
+++ b/firmware/usrp2/lib/banal.h
diff --git a/firmware/zpu/lib/clocks.c b/firmware/usrp2/lib/clocks.c
index bc1954e13..bc1954e13 100644
--- a/firmware/zpu/lib/clocks.c
+++ b/firmware/usrp2/lib/clocks.c
diff --git a/firmware/zpu/lib/clocks.h b/firmware/usrp2/lib/clocks.h
index 7bc7a3cda..7bc7a3cda 100644
--- a/firmware/zpu/lib/clocks.h
+++ b/firmware/usrp2/lib/clocks.h
diff --git a/firmware/zpu/lib/compiler.h b/firmware/usrp2/lib/compiler.h
index f677bdc3b..f677bdc3b 100644
--- a/firmware/zpu/lib/compiler.h
+++ b/firmware/usrp2/lib/compiler.h
diff --git a/firmware/zpu/lib/eeprom.c b/firmware/usrp2/lib/eeprom.c
index d4e170046..d4e170046 100644
--- a/firmware/zpu/lib/eeprom.c
+++ b/firmware/usrp2/lib/eeprom.c
diff --git a/firmware/zpu/lib/eth_addrs.c b/firmware/usrp2/lib/eth_addrs.c
index 6d3347cf3..6d3347cf3 100644
--- a/firmware/zpu/lib/eth_addrs.c
+++ b/firmware/usrp2/lib/eth_addrs.c
diff --git a/firmware/zpu/lib/eth_mac.c b/firmware/usrp2/lib/eth_mac.c
index 581a5c69f..581a5c69f 100644
--- a/firmware/zpu/lib/eth_mac.c
+++ b/firmware/usrp2/lib/eth_mac.c
diff --git a/firmware/zpu/lib/eth_mac.h b/firmware/usrp2/lib/eth_mac.h
index 73feec955..73feec955 100644
--- a/firmware/zpu/lib/eth_mac.h
+++ b/firmware/usrp2/lib/eth_mac.h
diff --git a/firmware/zpu/lib/ethernet.h b/firmware/usrp2/lib/ethernet.h
index b5b08cb8c..b5b08cb8c 100644
--- a/firmware/zpu/lib/ethernet.h
+++ b/firmware/usrp2/lib/ethernet.h
diff --git a/firmware/x300/include/ethertype.h b/firmware/usrp2/lib/ethertype.h
index 235981193..235981193 100644
--- a/firmware/x300/include/ethertype.h
+++ b/firmware/usrp2/lib/ethertype.h
diff --git a/firmware/zpu/lib/exit.c b/firmware/usrp2/lib/exit.c
index 95a3bf4de..95a3bf4de 100644
--- a/firmware/zpu/lib/exit.c
+++ b/firmware/usrp2/lib/exit.c
diff --git a/firmware/zpu/lib/hal_io.c b/firmware/usrp2/lib/hal_io.c
index d4be324f5..d4be324f5 100644
--- a/firmware/zpu/lib/hal_io.c
+++ b/firmware/usrp2/lib/hal_io.c
diff --git a/firmware/zpu/lib/hal_io.h b/firmware/usrp2/lib/hal_io.h
index 7a617685c..7a617685c 100644
--- a/firmware/zpu/lib/hal_io.h
+++ b/firmware/usrp2/lib/hal_io.h
diff --git a/firmware/zpu/lib/hal_uart.c b/firmware/usrp2/lib/hal_uart.c
index af60bed6a..af60bed6a 100644
--- a/firmware/zpu/lib/hal_uart.c
+++ b/firmware/usrp2/lib/hal_uart.c
diff --git a/firmware/zpu/lib/hal_uart.h b/firmware/usrp2/lib/hal_uart.h
index 793aface0..793aface0 100644
--- a/firmware/zpu/lib/hal_uart.h
+++ b/firmware/usrp2/lib/hal_uart.h
diff --git a/firmware/zpu/lib/i2c.c b/firmware/usrp2/lib/i2c.c
index d230f462c..d230f462c 100644
--- a/firmware/zpu/lib/i2c.c
+++ b/firmware/usrp2/lib/i2c.c
diff --git a/firmware/zpu/lib/i2c.h b/firmware/usrp2/lib/i2c.h
index 1af4d72df..1af4d72df 100644
--- a/firmware/zpu/lib/i2c.h
+++ b/firmware/usrp2/lib/i2c.h
diff --git a/firmware/zpu/lib/i2c_async.c b/firmware/usrp2/lib/i2c_async.c
index 05c4c3a09..05c4c3a09 100644
--- a/firmware/zpu/lib/i2c_async.c
+++ b/firmware/usrp2/lib/i2c_async.c
diff --git a/firmware/zpu/lib/i2c_async.h b/firmware/usrp2/lib/i2c_async.h
index e6095fca6..e6095fca6 100644
--- a/firmware/zpu/lib/i2c_async.h
+++ b/firmware/usrp2/lib/i2c_async.h
diff --git a/firmware/x300/include/if_arp.h b/firmware/usrp2/lib/if_arp.h
index 63519c4be..63519c4be 100644
--- a/firmware/x300/include/if_arp.h
+++ b/firmware/usrp2/lib/if_arp.h
diff --git a/firmware/zpu/lib/ihex.c b/firmware/usrp2/lib/ihex.c
index 97ecf73b6..97ecf73b6 100644
--- a/firmware/zpu/lib/ihex.c
+++ b/firmware/usrp2/lib/ihex.c
diff --git a/firmware/zpu/lib/ihex.h b/firmware/usrp2/lib/ihex.h
index 9f471fbe2..9f471fbe2 100644
--- a/firmware/zpu/lib/ihex.h
+++ b/firmware/usrp2/lib/ihex.h
diff --git a/firmware/zpu/lib/mdelay.c b/firmware/usrp2/lib/mdelay.c
index 8f9b14112..8f9b14112 100644
--- a/firmware/zpu/lib/mdelay.c
+++ b/firmware/usrp2/lib/mdelay.c
diff --git a/firmware/x300/include/mdelay.h b/firmware/usrp2/lib/mdelay.h
index 226bbb3f7..226bbb3f7 100644
--- a/firmware/x300/include/mdelay.h
+++ b/firmware/usrp2/lib/mdelay.h
diff --git a/firmware/zpu/lib/memcpy_wa.c b/firmware/usrp2/lib/memcpy_wa.c
index ef20efaa9..ef20efaa9 100644
--- a/firmware/zpu/lib/memcpy_wa.c
+++ b/firmware/usrp2/lib/memcpy_wa.c
diff --git a/firmware/zpu/lib/memcpy_wa.h b/firmware/usrp2/lib/memcpy_wa.h
index 072fc148f..072fc148f 100644
--- a/firmware/zpu/lib/memcpy_wa.h
+++ b/firmware/usrp2/lib/memcpy_wa.h
diff --git a/firmware/zpu/lib/memory_map.h b/firmware/usrp2/lib/memory_map.h
index b50a4433e..b50a4433e 100644
--- a/firmware/zpu/lib/memory_map.h
+++ b/firmware/usrp2/lib/memory_map.h
diff --git a/firmware/zpu/lib/memset_wa.c b/firmware/usrp2/lib/memset_wa.c
index da5da21ab..da5da21ab 100644
--- a/firmware/zpu/lib/memset_wa.c
+++ b/firmware/usrp2/lib/memset_wa.c
diff --git a/firmware/zpu/lib/memset_wa.h b/firmware/usrp2/lib/memset_wa.h
index 46d903d53..46d903d53 100644
--- a/firmware/zpu/lib/memset_wa.h
+++ b/firmware/usrp2/lib/memset_wa.h
diff --git a/firmware/zpu/lib/net/eth_mac_addr.h b/firmware/usrp2/lib/net/eth_mac_addr.h
index 01bf91988..01bf91988 100644
--- a/firmware/zpu/lib/net/eth_mac_addr.h
+++ b/firmware/usrp2/lib/net/eth_mac_addr.h
diff --git a/firmware/zpu/lib/net/padded_eth_hdr.h b/firmware/usrp2/lib/net/padded_eth_hdr.h
index df816734f..df816734f 100644
--- a/firmware/zpu/lib/net/padded_eth_hdr.h
+++ b/firmware/usrp2/lib/net/padded_eth_hdr.h
diff --git a/firmware/zpu/lib/net/socket_address.h b/firmware/usrp2/lib/net/socket_address.h
index 336f30a0c..336f30a0c 100644
--- a/firmware/zpu/lib/net/socket_address.h
+++ b/firmware/usrp2/lib/net/socket_address.h
diff --git a/firmware/zpu/lib/net_common.c b/firmware/usrp2/lib/net_common.c
index 9b75006d3..9b75006d3 100644
--- a/firmware/zpu/lib/net_common.c
+++ b/firmware/usrp2/lib/net_common.c
diff --git a/firmware/zpu/lib/net_common.h b/firmware/usrp2/lib/net_common.h
index 5e6daf689..5e6daf689 100644
--- a/firmware/zpu/lib/net_common.h
+++ b/firmware/usrp2/lib/net_common.h
diff --git a/firmware/zpu/lib/nonstdio.c b/firmware/usrp2/lib/nonstdio.c
index 4b5fa4123..4b5fa4123 100644
--- a/firmware/zpu/lib/nonstdio.c
+++ b/firmware/usrp2/lib/nonstdio.c
diff --git a/firmware/zpu/lib/nonstdio.h b/firmware/usrp2/lib/nonstdio.h
index a47a6df6e..a47a6df6e 100644
--- a/firmware/zpu/lib/nonstdio.h
+++ b/firmware/usrp2/lib/nonstdio.h
diff --git a/firmware/zpu/lib/pic.c b/firmware/usrp2/lib/pic.c
index bd627ce6b..bd627ce6b 100644
--- a/firmware/zpu/lib/pic.c
+++ b/firmware/usrp2/lib/pic.c
diff --git a/firmware/zpu/lib/pic.h b/firmware/usrp2/lib/pic.h
index cfdf721f4..cfdf721f4 100644
--- a/firmware/zpu/lib/pic.h
+++ b/firmware/usrp2/lib/pic.h
diff --git a/firmware/zpu/lib/pkt_ctrl.c b/firmware/usrp2/lib/pkt_ctrl.c
index 2bbe2f843..2bbe2f843 100644
--- a/firmware/zpu/lib/pkt_ctrl.c
+++ b/firmware/usrp2/lib/pkt_ctrl.c
diff --git a/firmware/zpu/lib/pkt_ctrl.h b/firmware/usrp2/lib/pkt_ctrl.h
index 15e4b0c4d..15e4b0c4d 100644
--- a/firmware/zpu/lib/pkt_ctrl.h
+++ b/firmware/usrp2/lib/pkt_ctrl.h
diff --git a/firmware/zpu/lib/print_addrs.c b/firmware/usrp2/lib/print_addrs.c
index fa2a49fc3..fa2a49fc3 100644
--- a/firmware/zpu/lib/print_addrs.c
+++ b/firmware/usrp2/lib/print_addrs.c
diff --git a/firmware/zpu/lib/print_buffer.c b/firmware/usrp2/lib/print_buffer.c
index 9f9104bb5..9f9104bb5 100644
--- a/firmware/zpu/lib/print_buffer.c
+++ b/firmware/usrp2/lib/print_buffer.c
diff --git a/firmware/zpu/lib/print_rmon_regs.c b/firmware/usrp2/lib/print_rmon_regs.c
index 6d9986909..6d9986909 100644
--- a/firmware/zpu/lib/print_rmon_regs.c
+++ b/firmware/usrp2/lib/print_rmon_regs.c
diff --git a/firmware/zpu/lib/print_rmon_regs.h b/firmware/usrp2/lib/print_rmon_regs.h
index 44e52da84..44e52da84 100644
--- a/firmware/zpu/lib/print_rmon_regs.h
+++ b/firmware/usrp2/lib/print_rmon_regs.h
diff --git a/firmware/zpu/lib/printf.c b/firmware/usrp2/lib/printf.c
index 45bd57cb9..45bd57cb9 100644
--- a/firmware/zpu/lib/printf.c
+++ b/firmware/usrp2/lib/printf.c
diff --git a/firmware/zpu/lib/printf.c.smaller b/firmware/usrp2/lib/printf.c.smaller
index 4d858648d..4d858648d 100644
--- a/firmware/zpu/lib/printf.c.smaller
+++ b/firmware/usrp2/lib/printf.c.smaller
diff --git a/firmware/zpu/lib/spi.c b/firmware/usrp2/lib/spi.c
index 6f2f74899..6f2f74899 100644
--- a/firmware/zpu/lib/spi.c
+++ b/firmware/usrp2/lib/spi.c
diff --git a/firmware/zpu/lib/spi.h b/firmware/usrp2/lib/spi.h
index 125e1a502..125e1a502 100644
--- a/firmware/zpu/lib/spi.h
+++ b/firmware/usrp2/lib/spi.h
diff --git a/firmware/x300/include/stdint.h b/firmware/usrp2/lib/stdint.h
index b5a8611a9..b5a8611a9 100644
--- a/firmware/x300/include/stdint.h
+++ b/firmware/usrp2/lib/stdint.h
diff --git a/firmware/zpu/lib/stdio.h b/firmware/usrp2/lib/stdio.h
index 12a7ed0bb..12a7ed0bb 100644
--- a/firmware/zpu/lib/stdio.h
+++ b/firmware/usrp2/lib/stdio.h
diff --git a/firmware/zpu/lib/u2_init.c b/firmware/usrp2/lib/u2_init.c
index 77c8c0722..77c8c0722 100644
--- a/firmware/zpu/lib/u2_init.c
+++ b/firmware/usrp2/lib/u2_init.c
diff --git a/firmware/zpu/lib/u2_init.h b/firmware/usrp2/lib/u2_init.h
index 848bd88de..848bd88de 100644
--- a/firmware/zpu/lib/u2_init.h
+++ b/firmware/usrp2/lib/u2_init.h
diff --git a/firmware/zpu/lib/udp_fw_update.h b/firmware/usrp2/lib/udp_fw_update.h
index d98447aef..d98447aef 100644
--- a/firmware/zpu/lib/udp_fw_update.h
+++ b/firmware/usrp2/lib/udp_fw_update.h
diff --git a/firmware/zpu/lib/udp_uart.c b/firmware/usrp2/lib/udp_uart.c
index a3940c05f..a3940c05f 100644
--- a/firmware/zpu/lib/udp_uart.c
+++ b/firmware/usrp2/lib/udp_uart.c
diff --git a/firmware/zpu/lib/udp_uart.h b/firmware/usrp2/lib/udp_uart.h
index d448e7611..d448e7611 100644
--- a/firmware/zpu/lib/udp_uart.h
+++ b/firmware/usrp2/lib/udp_uart.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/CHANGELOG b/firmware/usrp2/lwip/lwip-1.3.1/CHANGELOG
index a45765010..a45765010 100644
--- a/firmware/x300/lwip/lwip-1.3.1/CHANGELOG
+++ b/firmware/usrp2/lwip/lwip-1.3.1/CHANGELOG
diff --git a/firmware/x300/lwip/lwip-1.3.1/COPYING b/firmware/usrp2/lwip/lwip-1.3.1/COPYING
index e23898b5e..e23898b5e 100644
--- a/firmware/x300/lwip/lwip-1.3.1/COPYING
+++ b/firmware/usrp2/lwip/lwip-1.3.1/COPYING
diff --git a/firmware/x300/lwip/lwip-1.3.1/FILES b/firmware/usrp2/lwip/lwip-1.3.1/FILES
index 66253196f..66253196f 100644
--- a/firmware/x300/lwip/lwip-1.3.1/FILES
+++ b/firmware/usrp2/lwip/lwip-1.3.1/FILES
diff --git a/firmware/x300/lwip/lwip-1.3.1/README b/firmware/usrp2/lwip/lwip-1.3.1/README
index 8dda4b468..8dda4b468 100644
--- a/firmware/x300/lwip/lwip-1.3.1/README
+++ b/firmware/usrp2/lwip/lwip-1.3.1/README
diff --git a/firmware/x300/lwip/lwip-1.3.1/doc/FILES b/firmware/usrp2/lwip/lwip-1.3.1/doc/FILES
index 05d356f4f..05d356f4f 100644
--- a/firmware/x300/lwip/lwip-1.3.1/doc/FILES
+++ b/firmware/usrp2/lwip/lwip-1.3.1/doc/FILES
diff --git a/firmware/x300/lwip/lwip-1.3.1/doc/contrib.txt b/firmware/usrp2/lwip/lwip-1.3.1/doc/contrib.txt
index 39596fca3..39596fca3 100644
--- a/firmware/x300/lwip/lwip-1.3.1/doc/contrib.txt
+++ b/firmware/usrp2/lwip/lwip-1.3.1/doc/contrib.txt
diff --git a/firmware/x300/lwip/lwip-1.3.1/doc/rawapi.txt b/firmware/usrp2/lwip/lwip-1.3.1/doc/rawapi.txt
index 8eec6e786..8eec6e786 100644
--- a/firmware/x300/lwip/lwip-1.3.1/doc/rawapi.txt
+++ b/firmware/usrp2/lwip/lwip-1.3.1/doc/rawapi.txt
diff --git a/firmware/x300/lwip/lwip-1.3.1/doc/savannah.txt b/firmware/usrp2/lwip/lwip-1.3.1/doc/savannah.txt
index 409905b10..409905b10 100644
--- a/firmware/x300/lwip/lwip-1.3.1/doc/savannah.txt
+++ b/firmware/usrp2/lwip/lwip-1.3.1/doc/savannah.txt
diff --git a/firmware/x300/lwip/lwip-1.3.1/doc/snmp_agent.txt b/firmware/usrp2/lwip/lwip-1.3.1/doc/snmp_agent.txt
index 9b58616a6..9b58616a6 100644
--- a/firmware/x300/lwip/lwip-1.3.1/doc/snmp_agent.txt
+++ b/firmware/usrp2/lwip/lwip-1.3.1/doc/snmp_agent.txt
diff --git a/firmware/x300/lwip/lwip-1.3.1/doc/sys_arch.txt b/firmware/usrp2/lwip/lwip-1.3.1/doc/sys_arch.txt
index 66310a91e..66310a91e 100644
--- a/firmware/x300/lwip/lwip-1.3.1/doc/sys_arch.txt
+++ b/firmware/usrp2/lwip/lwip-1.3.1/doc/sys_arch.txt
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/.hgignore b/firmware/usrp2/lwip/lwip-1.3.1/src/.hgignore
index f88587df3..f88587df3 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/.hgignore
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/.hgignore
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/FILES b/firmware/usrp2/lwip/lwip-1.3.1/src/FILES
index 952aeabb4..952aeabb4 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/FILES
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/FILES
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/api/api_lib.c b/firmware/usrp2/lwip/lwip-1.3.1/src/api/api_lib.c
index 86df911ea..86df911ea 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/api/api_lib.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/api/api_lib.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/api/api_msg.c b/firmware/usrp2/lwip/lwip-1.3.1/src/api/api_msg.c
index 28d101019..28d101019 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/api/api_msg.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/api/api_msg.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/api/err.c b/firmware/usrp2/lwip/lwip-1.3.1/src/api/err.c
index a90cb98c8..a90cb98c8 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/api/err.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/api/err.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/api/netbuf.c b/firmware/usrp2/lwip/lwip-1.3.1/src/api/netbuf.c
index af44eefc7..af44eefc7 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/api/netbuf.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/api/netbuf.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/api/netdb.c b/firmware/usrp2/lwip/lwip-1.3.1/src/api/netdb.c
index 8aa237f4c..8aa237f4c 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/api/netdb.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/api/netdb.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/api/netifapi.c b/firmware/usrp2/lwip/lwip-1.3.1/src/api/netifapi.c
index 491837378..491837378 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/api/netifapi.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/api/netifapi.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/api/sockets.c b/firmware/usrp2/lwip/lwip-1.3.1/src/api/sockets.c
index f177261e1..f177261e1 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/api/sockets.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/api/sockets.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/api/tcpip.c b/firmware/usrp2/lwip/lwip-1.3.1/src/api/tcpip.c
index 002df90b2..002df90b2 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/api/tcpip.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/api/tcpip.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/dhcp.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/dhcp.c
index df0f97881..df0f97881 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/dhcp.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/dhcp.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/dns.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/dns.c
index 62a2592e9..62a2592e9 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/dns.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/dns.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/init.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/init.c
index 277811a6a..277811a6a 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/init.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/init.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/autoip.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/autoip.c
index 367adb060..367adb060 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/autoip.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/autoip.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/icmp.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/icmp.c
index b97a587a7..b97a587a7 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/icmp.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/icmp.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/igmp.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/igmp.c
index 7c07bc465..7c07bc465 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/igmp.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/igmp.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/inet.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/inet.c
index 69baf1d50..69baf1d50 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/inet.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/inet.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/inet_chksum.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/inet_chksum.c
index 185881efd..185881efd 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/inet_chksum.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/inet_chksum.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/ip.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/ip.c
index 7e404a9f3..7e404a9f3 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/ip.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/ip.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/ip_addr.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/ip_addr.c
index 94bf4678a..94bf4678a 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/ip_addr.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/ip_addr.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/ip_frag.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/ip_frag.c
index 1939d831b..1939d831b 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv4/ip_frag.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv4/ip_frag.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv6/README b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv6/README
index 362000486..362000486 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv6/README
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv6/README
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv6/icmp6.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv6/icmp6.c
index 4fcc89551..4fcc89551 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv6/icmp6.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv6/icmp6.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv6/inet6.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv6/inet6.c
index c3de85c09..c3de85c09 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv6/inet6.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv6/inet6.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv6/ip6.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv6/ip6.c
index 7e4342001..7e4342001 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv6/ip6.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv6/ip6.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv6/ip6_addr.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv6/ip6_addr.c
index 2da6cea42..2da6cea42 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/ipv6/ip6_addr.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/ipv6/ip6_addr.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/mem.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/mem.c
index b5f13ab3b..b5f13ab3b 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/mem.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/mem.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/memp.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/memp.c
index dfc32213d..dfc32213d 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/memp.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/memp.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/netif.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/netif.c
index c9b6b9b5e..c9b6b9b5e 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/netif.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/netif.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/pbuf.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/pbuf.c
index 50b22c354..50b22c354 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/pbuf.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/pbuf.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/raw.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/raw.c
index 589950e75..589950e75 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/raw.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/raw.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/asn1_dec.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/asn1_dec.c
index 650fb4037..650fb4037 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/asn1_dec.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/asn1_dec.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/asn1_enc.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/asn1_enc.c
index 77af6b4ba..77af6b4ba 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/asn1_enc.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/asn1_enc.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/mib2.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/mib2.c
index 33eeee66c..33eeee66c 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/mib2.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/mib2.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/mib_structs.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/mib_structs.c
index af8994ed2..af8994ed2 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/mib_structs.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/mib_structs.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/msg_in.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/msg_in.c
index d0c3c7534..d0c3c7534 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/msg_in.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/msg_in.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/msg_out.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/msg_out.c
index b705aaca7..b705aaca7 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/snmp/msg_out.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/snmp/msg_out.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/stats.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/stats.c
index a036d83bb..a036d83bb 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/stats.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/stats.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/sys.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/sys.c
index d1fbda4e6..d1fbda4e6 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/sys.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/sys.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/tcp.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/tcp.c
index 0f3fd41c3..0f3fd41c3 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/tcp.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/tcp.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/tcp_in.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/tcp_in.c
index 362a4a62d..362a4a62d 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/tcp_in.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/tcp_in.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/tcp_out.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/tcp_out.c
index ca72d9dcc..ca72d9dcc 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/tcp_out.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/tcp_out.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/core/udp.c b/firmware/usrp2/lwip/lwip-1.3.1/src/core/udp.c
index d8d644d44..d8d644d44 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/core/udp.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/core/udp.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/autoip.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/autoip.h
index 076a2ed23..076a2ed23 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/autoip.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/autoip.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/icmp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/icmp.h
index ff838f43a..ff838f43a 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/icmp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/icmp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/igmp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/igmp.h
index 59c933f35..59c933f35 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/igmp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/igmp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet.h
index 6f30d0d12..6f30d0d12 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet_chksum.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet_chksum.h
index 5cae59cbd..5cae59cbd 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet_chksum.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet_chksum.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip.h
index 14eba3ca5..14eba3ca5 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_addr.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_addr.h
index f2e4c2233..f2e4c2233 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_addr.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_addr.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_frag.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_frag.h
index 380e604dc..380e604dc 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_frag.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_frag.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv6/lwip/icmp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv6/lwip/icmp.h
index 87e9ffd96..87e9ffd96 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv6/lwip/icmp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv6/lwip/icmp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv6/lwip/inet.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv6/lwip/inet.h
index de1a0b636..de1a0b636 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv6/lwip/inet.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv6/lwip/inet.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip.h
index a01cfc65b..a01cfc65b 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip_addr.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip_addr.h
index b2d8ae566..b2d8ae566 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip_addr.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip_addr.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/api.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/api.h
index f6b1f7434..f6b1f7434 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/api.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/api.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/api_msg.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/api_msg.h
index 4272d77cc..4272d77cc 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/api_msg.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/api_msg.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/arch.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/arch.h
index 3a5a0e4f2..3a5a0e4f2 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/arch.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/arch.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/debug.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/debug.h
index d5c4e4747..d5c4e4747 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/debug.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/debug.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/def.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/def.h
index d2ed251df..d2ed251df 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/def.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/def.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/dhcp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/dhcp.h
index 825dba6ec..825dba6ec 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/dhcp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/dhcp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/dns.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/dns.h
index e5f4b7a3d..e5f4b7a3d 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/dns.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/dns.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/err.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/err.h
index 696764454..696764454 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/err.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/err.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/init.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/init.h
index a4dc0577f..a4dc0577f 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/init.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/init.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/mem.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/mem.h
index 327c2049f..327c2049f 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/mem.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/mem.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/memp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/memp.h
index f0d073994..f0d073994 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/memp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/memp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/memp_std.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/memp_std.h
index 344690328..344690328 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/memp_std.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/memp_std.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/netbuf.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/netbuf.h
index 6d84dd073..6d84dd073 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/netbuf.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/netbuf.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/netdb.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/netdb.h
index 0f7b2ec04..0f7b2ec04 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/netdb.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/netdb.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/netif.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/netif.h
index a32503052..a32503052 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/netif.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/netif.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/netifapi.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/netifapi.h
index 36c6bd0a2..36c6bd0a2 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/netifapi.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/netifapi.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/opt.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/opt.h
index e8bd8b89e..e8bd8b89e 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/opt.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/opt.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/pbuf.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/pbuf.h
index 8380f65da..8380f65da 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/pbuf.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/pbuf.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/raw.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/raw.h
index 20b0a11bb..20b0a11bb 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/raw.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/raw.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/sio.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/sio.h
index 7d9162e49..7d9162e49 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/sio.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/sio.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/snmp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/snmp.h
index dd03d5d70..dd03d5d70 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/snmp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/snmp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/snmp_asn1.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/snmp_asn1.h
index 8a602881f..8a602881f 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/snmp_asn1.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/snmp_asn1.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/snmp_msg.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/snmp_msg.h
index b2f69c4be..b2f69c4be 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/snmp_msg.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/snmp_msg.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/snmp_structs.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/snmp_structs.h
index 9f3f8a94e..9f3f8a94e 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/snmp_structs.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/snmp_structs.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/sockets.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/sockets.h
index 7b52e151c..7b52e151c 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/sockets.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/sockets.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/stats.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/stats.h
index aa179f5c0..aa179f5c0 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/stats.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/stats.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/sys.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/sys.h
index 0cc84ddf1..0cc84ddf1 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/sys.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/sys.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/tcp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/tcp.h
index 8f6b9d3c1..8f6b9d3c1 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/tcp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/tcp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/tcpip.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/tcpip.h
index 75393ee91..75393ee91 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/tcpip.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/tcpip.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/udp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/udp.h
index d7b2a3820..d7b2a3820 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/lwip/udp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/lwip/udp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/netif/etharp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/netif/etharp.h
index db691d91d..db691d91d 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/netif/etharp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/netif/etharp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/netif/loopif.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/netif/loopif.h
index 304af4b39..304af4b39 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/netif/loopif.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/netif/loopif.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/netif/ppp_oe.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/netif/ppp_oe.h
index 3aa55aec7..3aa55aec7 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/netif/ppp_oe.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/netif/ppp_oe.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/include/netif/slipif.h b/firmware/usrp2/lwip/lwip-1.3.1/src/include/netif/slipif.h
index aa08ada4a..aa08ada4a 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/include/netif/slipif.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/include/netif/slipif.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/FILES b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/FILES
index 1c4f5928d..1c4f5928d 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/FILES
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/FILES
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/etharp.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/etharp.c
index 73ea21173..73ea21173 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/etharp.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/etharp.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ethernetif.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ethernetif.c
index ccd7bd67f..ccd7bd67f 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ethernetif.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ethernetif.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/loopif.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/loopif.c
index 1e1f28cf1..1e1f28cf1 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/loopif.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/loopif.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/auth.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/auth.c
index 4c0ee6a8e..4c0ee6a8e 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/auth.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/auth.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/auth.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/auth.h
index 86ff04945..86ff04945 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/auth.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/auth.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/chap.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/chap.c
index 6d9c3c3ce..6d9c3c3ce 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/chap.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/chap.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/chap.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/chap.h
index 83dafd734..83dafd734 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/chap.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/chap.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/chpms.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/chpms.c
index 0c7521f20..0c7521f20 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/chpms.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/chpms.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/chpms.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/chpms.h
index df070fb35..df070fb35 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/chpms.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/chpms.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/fsm.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/fsm.c
index c073f1e36..c073f1e36 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/fsm.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/fsm.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/fsm.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/fsm.h
index 14034ec7f..14034ec7f 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/fsm.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/fsm.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/ipcp.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/ipcp.c
index 3a403a0a6..3a403a0a6 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/ipcp.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/ipcp.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/ipcp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/ipcp.h
index dfcf4fba6..dfcf4fba6 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/ipcp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/ipcp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/lcp.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/lcp.c
index 85a0add95..85a0add95 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/lcp.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/lcp.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/lcp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/lcp.h
index 1a5e5a4c0..1a5e5a4c0 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/lcp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/lcp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/magic.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/magic.c
index d3922bb56..d3922bb56 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/magic.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/magic.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/magic.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/magic.h
index bc5174993..bc5174993 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/magic.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/magic.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/md5.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/md5.c
index d65ecedbf..d65ecedbf 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/md5.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/md5.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/md5.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/md5.h
index e129533f3..e129533f3 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/md5.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/md5.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/pap.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/pap.c
index 7c3fd7e4c..7c3fd7e4c 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/pap.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/pap.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/pap.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/pap.h
index 0a09fc841..0a09fc841 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/pap.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/pap.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/ppp.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/ppp.c
index 8720c3368..8720c3368 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/ppp.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/ppp.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/ppp.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/ppp.h
index d5caa0a7e..d5caa0a7e 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/ppp.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/ppp.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/ppp_oe.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/ppp_oe.c
index c34c529b6..c34c529b6 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/ppp_oe.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/ppp_oe.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/pppdebug.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/pppdebug.h
index 6253863c9..6253863c9 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/pppdebug.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/pppdebug.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/randm.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/randm.c
index 0c622a0b0..0c622a0b0 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/randm.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/randm.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/randm.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/randm.h
index a0984b020..a0984b020 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/randm.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/randm.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/vj.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/vj.c
index 814ea72c5..814ea72c5 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/vj.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/vj.c
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/vj.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/vj.h
index b9617da4d..b9617da4d 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/vj.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/vj.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/vjbsdhdr.h b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/vjbsdhdr.h
index f46267614..f46267614 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/ppp/vjbsdhdr.h
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/ppp/vjbsdhdr.h
diff --git a/firmware/x300/lwip/lwip-1.3.1/src/netif/slipif.c b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/slipif.c
index 6cb2db442..6cb2db442 100644
--- a/firmware/x300/lwip/lwip-1.3.1/src/netif/slipif.c
+++ b/firmware/usrp2/lwip/lwip-1.3.1/src/netif/slipif.c
diff --git a/firmware/x300/lwip/lwipopts.h b/firmware/usrp2/lwip/lwipopts.h
index 3839eea83..3839eea83 100644
--- a/firmware/x300/lwip/lwipopts.h
+++ b/firmware/usrp2/lwip/lwipopts.h
diff --git a/firmware/x300/lwip/lwippools.h b/firmware/usrp2/lwip/lwippools.h
index caee23c82..caee23c82 100644
--- a/firmware/x300/lwip/lwippools.h
+++ b/firmware/usrp2/lwip/lwippools.h
diff --git a/firmware/x300/lwip_port/arch/cc.h b/firmware/usrp2/lwip_port/arch/cc.h
index d8d53ecf8..d8d53ecf8 100644
--- a/firmware/x300/lwip_port/arch/cc.h
+++ b/firmware/usrp2/lwip_port/arch/cc.h
diff --git a/firmware/x300/lwip_port/arch/perf.h b/firmware/usrp2/lwip_port/arch/perf.h
index f0906d03f..f0906d03f 100644
--- a/firmware/x300/lwip_port/arch/perf.h
+++ b/firmware/usrp2/lwip_port/arch/perf.h
diff --git a/firmware/x300/lwip_port/netif/eth_driver.c b/firmware/usrp2/lwip_port/netif/eth_driver.c
index 18c6eaf3e..18c6eaf3e 100644
--- a/firmware/x300/lwip_port/netif/eth_driver.c
+++ b/firmware/usrp2/lwip_port/netif/eth_driver.c
diff --git a/firmware/x300/lwip_port/netif/eth_driver.h b/firmware/usrp2/lwip_port/netif/eth_driver.h
index 72a212091..72a212091 100644
--- a/firmware/x300/lwip_port/netif/eth_driver.h
+++ b/firmware/usrp2/lwip_port/netif/eth_driver.h
diff --git a/firmware/zpu/usrp2/CMakeLists.txt b/firmware/usrp2/usrp2/CMakeLists.txt
index 3662532f1..3662532f1 100644
--- a/firmware/zpu/usrp2/CMakeLists.txt
+++ b/firmware/usrp2/usrp2/CMakeLists.txt
diff --git a/firmware/zpu/usrp2/eth_phy.h b/firmware/usrp2/usrp2/eth_phy.h
index 6c16f97b7..6c16f97b7 100644
--- a/firmware/zpu/usrp2/eth_phy.h
+++ b/firmware/usrp2/usrp2/eth_phy.h
diff --git a/firmware/zpu/usrp2/ethernet.c b/firmware/usrp2/usrp2/ethernet.c
index 9a41eb280..9a41eb280 100644
--- a/firmware/zpu/usrp2/ethernet.c
+++ b/firmware/usrp2/usrp2/ethernet.c
diff --git a/firmware/zpu/usrp2/sd.c b/firmware/usrp2/usrp2/sd.c
index d634baea8..d634baea8 100644
--- a/firmware/zpu/usrp2/sd.c
+++ b/firmware/usrp2/usrp2/sd.c
diff --git a/firmware/zpu/usrp2/sd.h b/firmware/usrp2/usrp2/sd.h
index e4b4aae8b..e4b4aae8b 100644
--- a/firmware/zpu/usrp2/sd.h
+++ b/firmware/usrp2/usrp2/sd.h
diff --git a/firmware/zpu/usrp2p/CMakeLists.txt b/firmware/usrp2/usrp2p/CMakeLists.txt
index 4cb663742..4cb663742 100644
--- a/firmware/zpu/usrp2p/CMakeLists.txt
+++ b/firmware/usrp2/usrp2p/CMakeLists.txt
diff --git a/firmware/zpu/usrp2p/bootconfig.h b/firmware/usrp2/usrp2p/bootconfig.h
index b64834d22..b64834d22 100644
--- a/firmware/zpu/usrp2p/bootconfig.h
+++ b/firmware/usrp2/usrp2p/bootconfig.h
diff --git a/firmware/zpu/usrp2p/bootloader/CMakeLists.txt b/firmware/usrp2/usrp2p/bootloader/CMakeLists.txt
index 07f234302..07f234302 100644
--- a/firmware/zpu/usrp2p/bootloader/CMakeLists.txt
+++ b/firmware/usrp2/usrp2p/bootloader/CMakeLists.txt
diff --git a/firmware/zpu/usrp2p/bootloader_utils.c b/firmware/usrp2/usrp2p/bootloader_utils.c
index 1efa643b6..1efa643b6 100644
--- a/firmware/zpu/usrp2p/bootloader_utils.c
+++ b/firmware/usrp2/usrp2p/bootloader_utils.c
diff --git a/firmware/zpu/usrp2p/bootloader_utils.h b/firmware/usrp2/usrp2p/bootloader_utils.h
index d70299b88..d70299b88 100644
--- a/firmware/zpu/usrp2p/bootloader_utils.h
+++ b/firmware/usrp2/usrp2p/bootloader_utils.h
diff --git a/firmware/zpu/usrp2p/eth_phy.h b/firmware/usrp2/usrp2p/eth_phy.h
index d233e96e8..d233e96e8 100644
--- a/firmware/zpu/usrp2p/eth_phy.h
+++ b/firmware/usrp2/usrp2p/eth_phy.h
diff --git a/firmware/zpu/usrp2p/ethernet.c b/firmware/usrp2/usrp2p/ethernet.c
index f5bd9f121..f5bd9f121 100644
--- a/firmware/zpu/usrp2p/ethernet.c
+++ b/firmware/usrp2/usrp2p/ethernet.c
diff --git a/firmware/zpu/usrp2p/spi_flash.c b/firmware/usrp2/usrp2p/spi_flash.c
index 09f908edb..09f908edb 100644
--- a/firmware/zpu/usrp2p/spi_flash.c
+++ b/firmware/usrp2/usrp2p/spi_flash.c
diff --git a/firmware/zpu/usrp2p/spi_flash.h b/firmware/usrp2/usrp2p/spi_flash.h
index 8a8facdca..8a8facdca 100644
--- a/firmware/zpu/usrp2p/spi_flash.h
+++ b/firmware/usrp2/usrp2p/spi_flash.h
diff --git a/firmware/zpu/usrp2p/spi_flash_private.h b/firmware/usrp2/usrp2p/spi_flash_private.h
index 6bf06fda8..6bf06fda8 100644
--- a/firmware/zpu/usrp2p/spi_flash_private.h
+++ b/firmware/usrp2/usrp2p/spi_flash_private.h
diff --git a/firmware/zpu/usrp2p/spi_flash_read.c b/firmware/usrp2/usrp2p/spi_flash_read.c
index fffc2a671..fffc2a671 100644
--- a/firmware/zpu/usrp2p/spi_flash_read.c
+++ b/firmware/usrp2/usrp2p/spi_flash_read.c
diff --git a/firmware/zpu/usrp2p/spif.c b/firmware/usrp2/usrp2p/spif.c
index 60807ca4a..60807ca4a 100644
--- a/firmware/zpu/usrp2p/spif.c
+++ b/firmware/usrp2/usrp2p/spif.c
diff --git a/firmware/zpu/usrp2p/u2p_init.c b/firmware/usrp2/usrp2p/u2p_init.c
index 1890dd726..1890dd726 100644
--- a/firmware/zpu/usrp2p/u2p_init.c
+++ b/firmware/usrp2/usrp2p/u2p_init.c
diff --git a/firmware/zpu/usrp2p/u2p_init.h b/firmware/usrp2/usrp2p/u2p_init.h
index b0dc20f1f..b0dc20f1f 100644
--- a/firmware/zpu/usrp2p/u2p_init.h
+++ b/firmware/usrp2/usrp2p/u2p_init.h
diff --git a/firmware/zpu/usrp2p/udp_fw_update.c b/firmware/usrp2/usrp2p/udp_fw_update.c
index cd9e7d902..cd9e7d902 100644
--- a/firmware/zpu/usrp2p/udp_fw_update.c
+++ b/firmware/usrp2/usrp2p/udp_fw_update.c
diff --git a/firmware/zpu/usrp2p/xilinx_s3_icap.c b/firmware/usrp2/usrp2p/xilinx_s3_icap.c
index 8995aa23d..8995aa23d 100644
--- a/firmware/zpu/usrp2p/xilinx_s3_icap.c
+++ b/firmware/usrp2/usrp2p/xilinx_s3_icap.c
diff --git a/firmware/zpu/usrp2p/xilinx_s3_icap.h b/firmware/usrp2/usrp2p/xilinx_s3_icap.h
index d4238eee9..d4238eee9 100644
--- a/firmware/zpu/usrp2p/xilinx_s3_icap.h
+++ b/firmware/usrp2/usrp2p/xilinx_s3_icap.h
diff --git a/firmware/zpu/.gitignore b/firmware/usrp3/.gitignore
index 796b96d1c..796b96d1c 100644
--- a/firmware/zpu/.gitignore
+++ b/firmware/usrp3/.gitignore
diff --git a/firmware/x300/CMakeLists.txt b/firmware/usrp3/CMakeLists.txt
index e2de46634..c25adb68a 100644
--- a/firmware/x300/CMakeLists.txt
+++ b/firmware/usrp3/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2012 Ettus Research LLC
+# Copyright 2010-2014 Ettus Research LLC
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 INCLUDE(CMakeForceCompiler)
 SET(CMAKE_SYSTEM_NAME Generic)
 CMAKE_FORCE_C_COMPILER(zpu-elf-gcc GNU)
-PROJECT(B250_FW C)
+PROJECT(USRP3_FW C)
 
 INCLUDE_DIRECTORIES(include)
 
@@ -45,7 +45,6 @@ INCLUDE_DIRECTORIES(
 # misc flags for the gcc compiler
 ########################################################################
 SET(CMAKE_C_FLAGS -phi) #always needed compile time and link time
-SET(CMAKE_C_FLAGS_DEBUG -DX300_DEBUG_UART)
 ADD_DEFINITIONS(-Os)
 ADD_DEFINITIONS(--std=gnu99)
 ADD_DEFINITIONS(-Wall)
@@ -72,7 +71,7 @@ FIND_PROGRAM(HEXDUMP hexdump)
 # helper functions to build output formats
 ########################################################################
 SET(GEN_OUTPUTS_BIN_SIZE "bin_size_not_set") #set before calling
-MACRO(GEN_OUTPUTS target)
+MACRO(GEN_OUTPUTS target pretty_name)
     GET_FILENAME_COMPONENT(name ${target} NAME_WE)
     #command to create a map from elf
     ADD_CUSTOM_COMMAND(
@@ -104,11 +103,11 @@ MACRO(GEN_OUTPUTS target)
     #command to create a coe from bin
     ADD_CUSTOM_COMMAND(
         OUTPUT ${name}.coe DEPENDS ${name}.bin
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/bin_to_coe.py ${name}.bin ${name}.coe
+        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/utils/bin_to_coe.py ${name}.bin ${name}.coe
     )
     #add a top level target for output files
     ADD_CUSTOM_TARGET(
-        ${name}_outputs ALL DEPENDS ${name}.map ${name}.bin ${name}.ihx ${name}.dump ${name}.rom ${name}.coe
+        ${pretty_name} ALL DEPENDS ${name}.map ${name}.bin ${name}.ihx ${name}.dump ${name}.rom ${name}.coe
     )
 ENDMACRO(GEN_OUTPUTS)
 
diff --git a/firmware/x300/include/chinch.h b/firmware/usrp3/include/chinch.h
index a3e70337a..a3e70337a 100644
--- a/firmware/x300/include/chinch.h
+++ b/firmware/usrp3/include/chinch.h
diff --git a/firmware/x300/include/ethernet.h b/firmware/usrp3/include/ethernet.h
index 52f14d05b..52f14d05b 100644
--- a/firmware/x300/include/ethernet.h
+++ b/firmware/usrp3/include/ethernet.h
diff --git a/firmware/zpu/lib/ethertype.h b/firmware/usrp3/include/ethertype.h
index 235981193..235981193 100644
--- a/firmware/zpu/lib/ethertype.h
+++ b/firmware/usrp3/include/ethertype.h
diff --git a/firmware/zpu/lib/if_arp.h b/firmware/usrp3/include/if_arp.h
index 63519c4be..63519c4be 100644
--- a/firmware/zpu/lib/if_arp.h
+++ b/firmware/usrp3/include/if_arp.h
diff --git a/firmware/x300/include/link_state_route_proto.h b/firmware/usrp3/include/link_state_route_proto.h
index 8feb3e717..8feb3e717 100644
--- a/firmware/x300/include/link_state_route_proto.h
+++ b/firmware/usrp3/include/link_state_route_proto.h
diff --git a/firmware/zpu/lib/mdelay.h b/firmware/usrp3/include/mdelay.h
index 226bbb3f7..226bbb3f7 100644
--- a/firmware/zpu/lib/mdelay.h
+++ b/firmware/usrp3/include/mdelay.h
diff --git a/firmware/x300/include/print_addrs.h b/firmware/usrp3/include/print_addrs.h
index 1aa5d6888..1aa5d6888 100644
--- a/firmware/x300/include/print_addrs.h
+++ b/firmware/usrp3/include/print_addrs.h
diff --git a/firmware/x300/include/printf.h b/firmware/usrp3/include/printf.h
index 6b3088dbe..6b3088dbe 100644
--- a/firmware/x300/include/printf.h
+++ b/firmware/usrp3/include/printf.h
diff --git a/firmware/zpu/lib/stdint.h b/firmware/usrp3/include/stdint.h
index b5a8611a9..b5a8611a9 100644
--- a/firmware/zpu/lib/stdint.h
+++ b/firmware/usrp3/include/stdint.h
diff --git a/firmware/x300/include/u3_net_stack.h b/firmware/usrp3/include/u3_net_stack.h
index cbf714e20..cbf714e20 100644
--- a/firmware/x300/include/u3_net_stack.h
+++ b/firmware/usrp3/include/u3_net_stack.h
diff --git a/firmware/x300/include/udp_uart.h b/firmware/usrp3/include/udp_uart.h
index 4a33a9299..4a33a9299 100644
--- a/firmware/x300/include/udp_uart.h
+++ b/firmware/usrp3/include/udp_uart.h
diff --git a/firmware/x300/include/wb_i2c.h b/firmware/usrp3/include/wb_i2c.h
index cb307f373..cb307f373 100644
--- a/firmware/x300/include/wb_i2c.h
+++ b/firmware/usrp3/include/wb_i2c.h
diff --git a/firmware/x300/include/wb_pkt_iface64.h b/firmware/usrp3/include/wb_pkt_iface64.h
index aa3c174ed..aa3c174ed 100644
--- a/firmware/x300/include/wb_pkt_iface64.h
+++ b/firmware/usrp3/include/wb_pkt_iface64.h
diff --git a/firmware/x300/include/wb_uart.h b/firmware/usrp3/include/wb_uart.h
index 46dd97441..46dd97441 100644
--- a/firmware/x300/include/wb_uart.h
+++ b/firmware/usrp3/include/wb_uart.h
diff --git a/firmware/x300/include/wb_utils.h b/firmware/usrp3/include/wb_utils.h
index 34be51b8f..34be51b8f 100644
--- a/firmware/x300/include/wb_utils.h
+++ b/firmware/usrp3/include/wb_utils.h
diff --git a/firmware/x300/include/xge_mac.h b/firmware/usrp3/include/xge_mac.h
index d288bdd8d..d288bdd8d 100644
--- a/firmware/x300/include/xge_mac.h
+++ b/firmware/usrp3/include/xge_mac.h
diff --git a/firmware/x300/include/xge_phy.h b/firmware/usrp3/include/xge_phy.h
index eeb94753e..eeb94753e 100644
--- a/firmware/x300/include/xge_phy.h
+++ b/firmware/usrp3/include/xge_phy.h
diff --git a/firmware/x300/lib/CMakeLists.txt b/firmware/usrp3/lib/CMakeLists.txt
index ed5a0a7c0..621b9b611 100644
--- a/firmware/x300/lib/CMakeLists.txt
+++ b/firmware/usrp3/lib/CMakeLists.txt
@@ -17,7 +17,7 @@
 
 ########################################################################
 
-add_library(usrpfw STATIC
+add_library(usrp3fw STATIC
     udp_uart.c
     wb_uart.c
     wb_i2c.c
diff --git a/firmware/x300/lib/chinch.c b/firmware/usrp3/lib/chinch.c
index e33378851..e33378851 100644
--- a/firmware/x300/lib/chinch.c
+++ b/firmware/usrp3/lib/chinch.c
diff --git a/firmware/x300/lib/ethernet.c b/firmware/usrp3/lib/ethernet.c
index 7a86980c7..7a86980c7 100644
--- a/firmware/x300/lib/ethernet.c
+++ b/firmware/usrp3/lib/ethernet.c
diff --git a/firmware/x300/lib/link_state_route_proto.c b/firmware/usrp3/lib/link_state_route_proto.c
index 30cfd73cb..30cfd73cb 100644
--- a/firmware/x300/lib/link_state_route_proto.c
+++ b/firmware/usrp3/lib/link_state_route_proto.c
diff --git a/firmware/x300/lib/mdelay.c b/firmware/usrp3/lib/mdelay.c
index 6d2742206..6d2742206 100644
--- a/firmware/x300/lib/mdelay.c
+++ b/firmware/usrp3/lib/mdelay.c
diff --git a/firmware/x300/lib/print_addrs.c b/firmware/usrp3/lib/print_addrs.c
index 6a710f75c..6a710f75c 100644
--- a/firmware/x300/lib/print_addrs.c
+++ b/firmware/usrp3/lib/print_addrs.c
diff --git a/firmware/x300/lib/printf.c b/firmware/usrp3/lib/printf.c
index 6d6a3e712..6d6a3e712 100644
--- a/firmware/x300/lib/printf.c
+++ b/firmware/usrp3/lib/printf.c
diff --git a/firmware/x300/lib/u3_net_stack.c b/firmware/usrp3/lib/u3_net_stack.c
index 6b8ef096c..6b8ef096c 100644
--- a/firmware/x300/lib/u3_net_stack.c
+++ b/firmware/usrp3/lib/u3_net_stack.c
diff --git a/firmware/x300/lib/udp_uart.c b/firmware/usrp3/lib/udp_uart.c
index d078aa2c3..d078aa2c3 100644
--- a/firmware/x300/lib/udp_uart.c
+++ b/firmware/usrp3/lib/udp_uart.c
diff --git a/firmware/x300/lib/wb_i2c.c b/firmware/usrp3/lib/wb_i2c.c
index 611908e18..611908e18 100644
--- a/firmware/x300/lib/wb_i2c.c
+++ b/firmware/usrp3/lib/wb_i2c.c
diff --git a/firmware/x300/lib/wb_pkt_iface64.c b/firmware/usrp3/lib/wb_pkt_iface64.c
index 3c0774bdd..3c0774bdd 100644
--- a/firmware/x300/lib/wb_pkt_iface64.c
+++ b/firmware/usrp3/lib/wb_pkt_iface64.c
diff --git a/firmware/x300/lib/wb_uart.c b/firmware/usrp3/lib/wb_uart.c
index 368d0e150..368d0e150 100644
--- a/firmware/x300/lib/wb_uart.c
+++ b/firmware/usrp3/lib/wb_uart.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/CHANGELOG b/firmware/usrp3/lwip/lwip-1.3.1/CHANGELOG
index a45765010..a45765010 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/CHANGELOG
+++ b/firmware/usrp3/lwip/lwip-1.3.1/CHANGELOG
diff --git a/firmware/zpu/lwip/lwip-1.3.1/COPYING b/firmware/usrp3/lwip/lwip-1.3.1/COPYING
index e23898b5e..e23898b5e 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/COPYING
+++ b/firmware/usrp3/lwip/lwip-1.3.1/COPYING
diff --git a/firmware/zpu/lwip/lwip-1.3.1/FILES b/firmware/usrp3/lwip/lwip-1.3.1/FILES
index 66253196f..66253196f 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/FILES
+++ b/firmware/usrp3/lwip/lwip-1.3.1/FILES
diff --git a/firmware/zpu/lwip/lwip-1.3.1/README b/firmware/usrp3/lwip/lwip-1.3.1/README
index 8dda4b468..8dda4b468 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/README
+++ b/firmware/usrp3/lwip/lwip-1.3.1/README
diff --git a/firmware/zpu/lwip/lwip-1.3.1/doc/FILES b/firmware/usrp3/lwip/lwip-1.3.1/doc/FILES
index 05d356f4f..05d356f4f 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/doc/FILES
+++ b/firmware/usrp3/lwip/lwip-1.3.1/doc/FILES
diff --git a/firmware/zpu/lwip/lwip-1.3.1/doc/contrib.txt b/firmware/usrp3/lwip/lwip-1.3.1/doc/contrib.txt
index 39596fca3..39596fca3 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/doc/contrib.txt
+++ b/firmware/usrp3/lwip/lwip-1.3.1/doc/contrib.txt
diff --git a/firmware/zpu/lwip/lwip-1.3.1/doc/rawapi.txt b/firmware/usrp3/lwip/lwip-1.3.1/doc/rawapi.txt
index 8eec6e786..8eec6e786 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/doc/rawapi.txt
+++ b/firmware/usrp3/lwip/lwip-1.3.1/doc/rawapi.txt
diff --git a/firmware/zpu/lwip/lwip-1.3.1/doc/savannah.txt b/firmware/usrp3/lwip/lwip-1.3.1/doc/savannah.txt
index 409905b10..409905b10 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/doc/savannah.txt
+++ b/firmware/usrp3/lwip/lwip-1.3.1/doc/savannah.txt
diff --git a/firmware/zpu/lwip/lwip-1.3.1/doc/snmp_agent.txt b/firmware/usrp3/lwip/lwip-1.3.1/doc/snmp_agent.txt
index 9b58616a6..9b58616a6 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/doc/snmp_agent.txt
+++ b/firmware/usrp3/lwip/lwip-1.3.1/doc/snmp_agent.txt
diff --git a/firmware/zpu/lwip/lwip-1.3.1/doc/sys_arch.txt b/firmware/usrp3/lwip/lwip-1.3.1/doc/sys_arch.txt
index 66310a91e..66310a91e 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/doc/sys_arch.txt
+++ b/firmware/usrp3/lwip/lwip-1.3.1/doc/sys_arch.txt
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/.hgignore b/firmware/usrp3/lwip/lwip-1.3.1/src/.hgignore
index f88587df3..f88587df3 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/.hgignore
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/.hgignore
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/FILES b/firmware/usrp3/lwip/lwip-1.3.1/src/FILES
index 952aeabb4..952aeabb4 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/FILES
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/FILES
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/api/api_lib.c b/firmware/usrp3/lwip/lwip-1.3.1/src/api/api_lib.c
index 86df911ea..86df911ea 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/api/api_lib.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/api/api_lib.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/api/api_msg.c b/firmware/usrp3/lwip/lwip-1.3.1/src/api/api_msg.c
index 28d101019..28d101019 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/api/api_msg.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/api/api_msg.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/api/err.c b/firmware/usrp3/lwip/lwip-1.3.1/src/api/err.c
index a90cb98c8..a90cb98c8 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/api/err.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/api/err.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/api/netbuf.c b/firmware/usrp3/lwip/lwip-1.3.1/src/api/netbuf.c
index af44eefc7..af44eefc7 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/api/netbuf.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/api/netbuf.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/api/netdb.c b/firmware/usrp3/lwip/lwip-1.3.1/src/api/netdb.c
index 8aa237f4c..8aa237f4c 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/api/netdb.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/api/netdb.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/api/netifapi.c b/firmware/usrp3/lwip/lwip-1.3.1/src/api/netifapi.c
index 491837378..491837378 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/api/netifapi.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/api/netifapi.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/api/sockets.c b/firmware/usrp3/lwip/lwip-1.3.1/src/api/sockets.c
index f177261e1..f177261e1 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/api/sockets.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/api/sockets.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/api/tcpip.c b/firmware/usrp3/lwip/lwip-1.3.1/src/api/tcpip.c
index 002df90b2..002df90b2 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/api/tcpip.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/api/tcpip.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/dhcp.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/dhcp.c
index df0f97881..df0f97881 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/dhcp.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/dhcp.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/dns.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/dns.c
index 62a2592e9..62a2592e9 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/dns.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/dns.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/init.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/init.c
index 277811a6a..277811a6a 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/init.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/init.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/autoip.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/autoip.c
index 367adb060..367adb060 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/autoip.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/autoip.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/icmp.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/icmp.c
index b97a587a7..b97a587a7 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/icmp.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/icmp.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/igmp.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/igmp.c
index 7c07bc465..7c07bc465 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/igmp.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/igmp.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/inet.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/inet.c
index 69baf1d50..69baf1d50 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/inet.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/inet.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/inet_chksum.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/inet_chksum.c
index 185881efd..185881efd 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/inet_chksum.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/inet_chksum.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/ip.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/ip.c
index 7e404a9f3..7e404a9f3 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/ip.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/ip.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/ip_addr.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/ip_addr.c
index 94bf4678a..94bf4678a 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/ip_addr.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/ip_addr.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/ip_frag.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/ip_frag.c
index 1939d831b..1939d831b 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv4/ip_frag.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv4/ip_frag.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv6/README b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv6/README
index 362000486..362000486 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv6/README
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv6/README
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv6/icmp6.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv6/icmp6.c
index 4fcc89551..4fcc89551 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv6/icmp6.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv6/icmp6.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv6/inet6.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv6/inet6.c
index c3de85c09..c3de85c09 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv6/inet6.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv6/inet6.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv6/ip6.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv6/ip6.c
index 7e4342001..7e4342001 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv6/ip6.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv6/ip6.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv6/ip6_addr.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv6/ip6_addr.c
index 2da6cea42..2da6cea42 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/ipv6/ip6_addr.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/ipv6/ip6_addr.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/mem.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/mem.c
index b5f13ab3b..b5f13ab3b 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/mem.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/mem.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/memp.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/memp.c
index dfc32213d..dfc32213d 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/memp.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/memp.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/netif.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/netif.c
index c9b6b9b5e..c9b6b9b5e 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/netif.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/netif.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/pbuf.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/pbuf.c
index 50b22c354..50b22c354 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/pbuf.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/pbuf.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/raw.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/raw.c
index 589950e75..589950e75 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/raw.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/raw.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/asn1_dec.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/asn1_dec.c
index 650fb4037..650fb4037 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/asn1_dec.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/asn1_dec.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/asn1_enc.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/asn1_enc.c
index 77af6b4ba..77af6b4ba 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/asn1_enc.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/asn1_enc.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/mib2.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/mib2.c
index 33eeee66c..33eeee66c 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/mib2.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/mib2.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/mib_structs.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/mib_structs.c
index af8994ed2..af8994ed2 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/mib_structs.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/mib_structs.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/msg_in.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/msg_in.c
index d0c3c7534..d0c3c7534 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/msg_in.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/msg_in.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/msg_out.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/msg_out.c
index b705aaca7..b705aaca7 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/snmp/msg_out.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/snmp/msg_out.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/stats.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/stats.c
index a036d83bb..a036d83bb 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/stats.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/stats.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/sys.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/sys.c
index d1fbda4e6..d1fbda4e6 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/sys.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/sys.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/tcp.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/tcp.c
index 0f3fd41c3..0f3fd41c3 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/tcp.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/tcp.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/tcp_in.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/tcp_in.c
index 362a4a62d..362a4a62d 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/tcp_in.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/tcp_in.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/tcp_out.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/tcp_out.c
index ca72d9dcc..ca72d9dcc 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/tcp_out.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/tcp_out.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/core/udp.c b/firmware/usrp3/lwip/lwip-1.3.1/src/core/udp.c
index d8d644d44..d8d644d44 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/core/udp.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/core/udp.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/autoip.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/autoip.h
index 076a2ed23..076a2ed23 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/autoip.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/autoip.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/icmp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/icmp.h
index ff838f43a..ff838f43a 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/icmp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/icmp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/igmp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/igmp.h
index 59c933f35..59c933f35 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/igmp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/igmp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet.h
index 6f30d0d12..6f30d0d12 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet_chksum.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet_chksum.h
index 5cae59cbd..5cae59cbd 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet_chksum.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/inet_chksum.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip.h
index 14eba3ca5..14eba3ca5 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_addr.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_addr.h
index f2e4c2233..f2e4c2233 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_addr.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_addr.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_frag.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_frag.h
index 380e604dc..380e604dc 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_frag.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv4/lwip/ip_frag.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv6/lwip/icmp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv6/lwip/icmp.h
index 87e9ffd96..87e9ffd96 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv6/lwip/icmp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv6/lwip/icmp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv6/lwip/inet.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv6/lwip/inet.h
index de1a0b636..de1a0b636 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv6/lwip/inet.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv6/lwip/inet.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip.h
index a01cfc65b..a01cfc65b 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip_addr.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip_addr.h
index b2d8ae566..b2d8ae566 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip_addr.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/ipv6/lwip/ip_addr.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/api.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/api.h
index f6b1f7434..f6b1f7434 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/api.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/api.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/api_msg.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/api_msg.h
index 4272d77cc..4272d77cc 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/api_msg.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/api_msg.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/arch.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/arch.h
index 3a5a0e4f2..3a5a0e4f2 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/arch.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/arch.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/debug.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/debug.h
index d5c4e4747..d5c4e4747 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/debug.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/debug.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/def.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/def.h
index d2ed251df..d2ed251df 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/def.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/def.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/dhcp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/dhcp.h
index 825dba6ec..825dba6ec 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/dhcp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/dhcp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/dns.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/dns.h
index e5f4b7a3d..e5f4b7a3d 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/dns.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/dns.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/err.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/err.h
index 696764454..696764454 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/err.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/err.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/init.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/init.h
index a4dc0577f..a4dc0577f 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/init.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/init.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/mem.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/mem.h
index 327c2049f..327c2049f 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/mem.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/mem.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/memp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/memp.h
index f0d073994..f0d073994 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/memp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/memp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/memp_std.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/memp_std.h
index 344690328..344690328 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/memp_std.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/memp_std.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/netbuf.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/netbuf.h
index 6d84dd073..6d84dd073 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/netbuf.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/netbuf.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/netdb.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/netdb.h
index 0f7b2ec04..0f7b2ec04 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/netdb.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/netdb.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/netif.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/netif.h
index a32503052..a32503052 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/netif.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/netif.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/netifapi.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/netifapi.h
index 36c6bd0a2..36c6bd0a2 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/netifapi.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/netifapi.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/opt.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/opt.h
index e8bd8b89e..e8bd8b89e 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/opt.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/opt.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/pbuf.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/pbuf.h
index 8380f65da..8380f65da 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/pbuf.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/pbuf.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/raw.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/raw.h
index 20b0a11bb..20b0a11bb 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/raw.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/raw.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/sio.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/sio.h
index 7d9162e49..7d9162e49 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/sio.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/sio.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/snmp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/snmp.h
index dd03d5d70..dd03d5d70 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/snmp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/snmp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/snmp_asn1.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/snmp_asn1.h
index 8a602881f..8a602881f 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/snmp_asn1.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/snmp_asn1.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/snmp_msg.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/snmp_msg.h
index b2f69c4be..b2f69c4be 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/snmp_msg.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/snmp_msg.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/snmp_structs.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/snmp_structs.h
index 9f3f8a94e..9f3f8a94e 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/snmp_structs.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/snmp_structs.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/sockets.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/sockets.h
index 7b52e151c..7b52e151c 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/sockets.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/sockets.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/stats.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/stats.h
index aa179f5c0..aa179f5c0 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/stats.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/stats.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/sys.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/sys.h
index 0cc84ddf1..0cc84ddf1 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/sys.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/sys.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/tcp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/tcp.h
index 8f6b9d3c1..8f6b9d3c1 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/tcp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/tcp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/tcpip.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/tcpip.h
index 75393ee91..75393ee91 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/tcpip.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/tcpip.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/udp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/udp.h
index d7b2a3820..d7b2a3820 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/lwip/udp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/lwip/udp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/netif/etharp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/netif/etharp.h
index db691d91d..db691d91d 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/netif/etharp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/netif/etharp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/netif/loopif.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/netif/loopif.h
index 304af4b39..304af4b39 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/netif/loopif.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/netif/loopif.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/netif/ppp_oe.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/netif/ppp_oe.h
index 3aa55aec7..3aa55aec7 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/netif/ppp_oe.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/netif/ppp_oe.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/include/netif/slipif.h b/firmware/usrp3/lwip/lwip-1.3.1/src/include/netif/slipif.h
index aa08ada4a..aa08ada4a 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/include/netif/slipif.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/include/netif/slipif.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/FILES b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/FILES
index 1c4f5928d..1c4f5928d 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/FILES
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/FILES
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/etharp.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/etharp.c
index 73ea21173..73ea21173 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/etharp.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/etharp.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ethernetif.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ethernetif.c
index ccd7bd67f..ccd7bd67f 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ethernetif.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ethernetif.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/loopif.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/loopif.c
index 1e1f28cf1..1e1f28cf1 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/loopif.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/loopif.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/auth.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/auth.c
index 4c0ee6a8e..4c0ee6a8e 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/auth.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/auth.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/auth.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/auth.h
index 86ff04945..86ff04945 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/auth.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/auth.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/chap.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/chap.c
index 6d9c3c3ce..6d9c3c3ce 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/chap.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/chap.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/chap.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/chap.h
index 83dafd734..83dafd734 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/chap.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/chap.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/chpms.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/chpms.c
index 0c7521f20..0c7521f20 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/chpms.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/chpms.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/chpms.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/chpms.h
index df070fb35..df070fb35 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/chpms.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/chpms.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/fsm.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/fsm.c
index c073f1e36..c073f1e36 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/fsm.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/fsm.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/fsm.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/fsm.h
index 14034ec7f..14034ec7f 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/fsm.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/fsm.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/ipcp.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/ipcp.c
index 3a403a0a6..3a403a0a6 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/ipcp.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/ipcp.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/ipcp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/ipcp.h
index dfcf4fba6..dfcf4fba6 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/ipcp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/ipcp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/lcp.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/lcp.c
index 85a0add95..85a0add95 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/lcp.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/lcp.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/lcp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/lcp.h
index 1a5e5a4c0..1a5e5a4c0 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/lcp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/lcp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/magic.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/magic.c
index d3922bb56..d3922bb56 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/magic.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/magic.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/magic.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/magic.h
index bc5174993..bc5174993 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/magic.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/magic.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/md5.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/md5.c
index d65ecedbf..d65ecedbf 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/md5.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/md5.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/md5.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/md5.h
index e129533f3..e129533f3 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/md5.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/md5.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/pap.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/pap.c
index 7c3fd7e4c..7c3fd7e4c 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/pap.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/pap.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/pap.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/pap.h
index 0a09fc841..0a09fc841 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/pap.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/pap.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/ppp.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/ppp.c
index 8720c3368..8720c3368 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/ppp.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/ppp.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/ppp.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/ppp.h
index d5caa0a7e..d5caa0a7e 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/ppp.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/ppp.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/ppp_oe.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/ppp_oe.c
index c34c529b6..c34c529b6 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/ppp_oe.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/ppp_oe.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/pppdebug.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/pppdebug.h
index 6253863c9..6253863c9 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/pppdebug.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/pppdebug.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/randm.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/randm.c
index 0c622a0b0..0c622a0b0 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/randm.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/randm.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/randm.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/randm.h
index a0984b020..a0984b020 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/randm.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/randm.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/vj.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/vj.c
index 814ea72c5..814ea72c5 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/vj.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/vj.c
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/vj.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/vj.h
index b9617da4d..b9617da4d 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/vj.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/vj.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/vjbsdhdr.h b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/vjbsdhdr.h
index f46267614..f46267614 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/ppp/vjbsdhdr.h
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/ppp/vjbsdhdr.h
diff --git a/firmware/zpu/lwip/lwip-1.3.1/src/netif/slipif.c b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/slipif.c
index 6cb2db442..6cb2db442 100644
--- a/firmware/zpu/lwip/lwip-1.3.1/src/netif/slipif.c
+++ b/firmware/usrp3/lwip/lwip-1.3.1/src/netif/slipif.c
diff --git a/firmware/zpu/lwip/lwipopts.h b/firmware/usrp3/lwip/lwipopts.h
index 3839eea83..3839eea83 100644
--- a/firmware/zpu/lwip/lwipopts.h
+++ b/firmware/usrp3/lwip/lwipopts.h
diff --git a/firmware/zpu/lwip/lwippools.h b/firmware/usrp3/lwip/lwippools.h
index caee23c82..caee23c82 100644
--- a/firmware/zpu/lwip/lwippools.h
+++ b/firmware/usrp3/lwip/lwippools.h
diff --git a/firmware/zpu/lwip_port/arch/cc.h b/firmware/usrp3/lwip_port/arch/cc.h
index d8d53ecf8..d8d53ecf8 100644
--- a/firmware/zpu/lwip_port/arch/cc.h
+++ b/firmware/usrp3/lwip_port/arch/cc.h
diff --git a/firmware/zpu/lwip_port/arch/perf.h b/firmware/usrp3/lwip_port/arch/perf.h
index f0906d03f..f0906d03f 100644
--- a/firmware/zpu/lwip_port/arch/perf.h
+++ b/firmware/usrp3/lwip_port/arch/perf.h
diff --git a/firmware/zpu/lwip_port/netif/eth_driver.c b/firmware/usrp3/lwip_port/netif/eth_driver.c
index 18c6eaf3e..18c6eaf3e 100644
--- a/firmware/zpu/lwip_port/netif/eth_driver.c
+++ b/firmware/usrp3/lwip_port/netif/eth_driver.c
diff --git a/firmware/zpu/lwip_port/netif/eth_driver.h b/firmware/usrp3/lwip_port/netif/eth_driver.h
index 72a212091..72a212091 100644
--- a/firmware/zpu/lwip_port/netif/eth_driver.h
+++ b/firmware/usrp3/lwip_port/netif/eth_driver.h
diff --git a/firmware/x300/bin_to_coe.py b/firmware/usrp3/utils/bin_to_coe.py
index 332c705ae..332c705ae 100755
--- a/firmware/x300/bin_to_coe.py
+++ b/firmware/usrp3/utils/bin_to_coe.py
diff --git a/firmware/x300/x300/CMakeLists.txt b/firmware/usrp3/x300/CMakeLists.txt
index f4cddd2c3..5e6134885 100644
--- a/firmware/x300/x300/CMakeLists.txt
+++ b/firmware/usrp3/x300/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2013 Ettus Research LLC
+# Copyright 2010-2014 Ettus Research LLC
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,10 +23,11 @@ list(APPEND x300_sources x300_init.c x300_main.c)
 
 ########################################################################
 set(GEN_OUTPUTS_BIN_SIZE 0x7fff)
+SET(CMAKE_C_FLAGS_DEBUG -DX300_DEBUG_UART)
 
 add_executable(x300_main.elf ${x300_sources})
-target_link_libraries(x300_main.elf usrpfw)
-GEN_OUTPUTS(x300_main.elf)
+target_link_libraries(x300_main.elf usrp3fw)
+GEN_OUTPUTS(x300_main.elf x300)
 
 INSTALL(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/x300_main.bin
diff --git a/firmware/usrp3/x300/x300_debug.py b/firmware/usrp3/x300/x300_debug.py
new file mode 100755
index 000000000..c9bcbb138
--- /dev/null
+++ b/firmware/usrp3/x300/x300_debug.py
@@ -0,0 +1,167 @@
+#!/usr/bin/env python
+#
+# Copyright 2010-2011 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import optparse
+import math
+import socket
+import struct
+
+
+########################################################################
+# constants
+########################################################################
+B250_FW_COMMS_UDP_PORT = 49152
+
+B250_FW_COMMS_FLAGS_ACK = 1
+B250_FW_COMMS_FLAGS_ERROR = 2
+B250_FW_COMMS_FLAGS_POKE32 = 4
+B250_FW_COMMS_FLAGS_PEEK32 = 8
+
+#UDP_CTRL_PORT = 49183
+UDP_MAX_XFER_BYTES = 1024
+UDP_TIMEOUT = 3
+#USRP2_FW_PROTO_VERSION = 11 #should be unused after r6
+
+#REG_ARGS_FMT = '!LLLLLB15x'
+#REG_IP_FMT = '!LLLL20x'
+REG_PEEK_POKE_FMT = '!LLLL'
+
+
+_seq = -1
+def seq():
+    global _seq
+    _seq = _seq+1
+    return _seq
+
+
+########################################################################
+# helper functions
+########################################################################
+
+def unpack_reg_peek_poke_fmt(s):
+    return struct.unpack(REG_PEEK_POKE_FMT,s) #(flags, seq, addr, data)
+
+def pack_reg_peek_poke_fmt(flags, seq, addr, data):
+    return struct.pack(REG_PEEK_POKE_FMT, flags, seq, addr, data);
+
+########################################################################
+# Burner class, holds a socket and send/recv routines
+########################################################################
+class ctrl_socket(object):
+    def __init__(self, addr):
+        self._sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        self._sock.settimeout(UDP_TIMEOUT)
+        self._sock.connect((addr, B250_FW_COMMS_UDP_PORT))
+        self.set_callbacks(lambda *a: None, lambda *a: None)
+        #self.init_update() #check that the device is there
+
+    def set_callbacks(self, progress_cb, status_cb):
+        self._progress_cb = progress_cb
+        self._status_cb = status_cb
+
+    def send_and_recv(self, pkt):
+        self._sock.send(pkt)
+        return self._sock.recv(UDP_MAX_XFER_BYTES)
+
+    def read_router_stats(self):
+        print
+        print("            "),
+        ports = ['        eth0','        eth1','      radio0','      radio1','    compute0','    compute1','    compute2','        pcie']
+        for in_prt in ports:
+            print("%s" % in_prt),
+        print("   Egress Port")
+        print("             "),
+        for in_prt in range (0, 8):
+            print("____________"),
+        print
+        for in_prt in range (0, 8):
+            print("%s |" % ports[in_prt]),
+            for out_prt in range (0, 8):
+                out_pkt = pack_reg_peek_poke_fmt(B250_FW_COMMS_FLAGS_PEEK32|B250_FW_COMMS_FLAGS_ACK, seq(), 0xA000+256+((in_prt*8+out_prt)*4), 0)
+                in_pkt = self.send_and_recv(out_pkt)
+                (flags, rxseq, addr, data) = unpack_reg_peek_poke_fmt(in_pkt)
+                if flags & B250_FW_COMMS_FLAGS_ERROR == B250_FW_COMMS_FLAGS_ERROR:
+                    raise Exception("B250 peek returns error code")
+                print("%10d  " % (data)),
+            print
+        print
+        print("Ingress Port")
+        print
+
+
+    def peek(self,peek_addr):
+        out_pkt = pack_reg_peek_poke_fmt(B250_FW_COMMS_FLAGS_PEEK32|B250_FW_COMMS_FLAGS_ACK, seq(), peek_addr, 0)
+        in_pkt = self.send_and_recv(out_pkt)
+        (flags, rxseq, addr, data) = unpack_reg_peek_poke_fmt(in_pkt)
+        if flags & B250_FW_COMMS_FLAGS_ERROR == B250_FW_COMMS_FLAGS_ERROR:
+            raise Exception("B250 peek of address %d returns error code" % (addr))
+        print("PEEK of address %d(0x%x) reads %d(0x%x)" % (addr,addr,data,data))
+
+    def poke(self,poke_addr,poke_data):
+        out_pkt = pack_reg_peek_poke_fmt(B250_FW_COMMS_FLAGS_POKE32|B250_FW_COMMS_FLAGS_ACK, seq(), poke_addr, poke_data)
+        in_pkt = self.send_and_recv(out_pkt)
+        (flags, rxseq, addr, data) = unpack_reg_peek_poke_fmt(in_pkt)
+        if flags & B250_FW_COMMS_FLAGS_ERROR == B250_FW_COMMS_FLAGS_ERROR:
+            raise Exception("B250 peek of address %d returns error code" % (addr))
+        print("POKE of address %d(0x%x) with %d(0x%x)" % (poke_addr,poke_addr,poke_data,poke_data)  )
+
+
+########################################################################
+# command line options
+########################################################################
+def get_options():
+    parser = optparse.OptionParser()
+    parser.add_option("--addr", type="string",                 help="USRP-N2XX device address",       default='')
+    parser.add_option("--list", action="store_true",           help="list possible network devices", default=False)
+    parser.add_option("--peek", type="int",                 help="Read from memory map",     default=None)
+    parser.add_option("--poke", type="int",                 help="Write to memory map",     default=None)
+    parser.add_option("--data", type="int",                 help="Data for poke",     default=None)
+    parser.add_option("--stats", action="store_true",           help="Display SuperMIMO Network Stats", default=False)
+    (options, args) = parser.parse_args()
+
+    return options
+
+
+########################################################################
+# main
+########################################################################
+if __name__=='__main__':
+    options = get_options()
+
+
+    if options.list:
+        print('Possible network devices:')
+        print('  ' + '\n  '.join(enumerate_devices()))
+        exit()
+
+    if not options.addr: raise Exception('no address specified')
+
+    status = ctrl_socket(addr=options.addr)
+
+    if options.stats:
+        status.read_router_stats()
+
+
+    if options.peek is not None:
+        addr = options.peek
+        status.peek(addr)
+
+    if options.poke is not None and options.data is not None:
+        addr = options.poke
+        data = options.data
+        status.poke(addr,data)
diff --git a/firmware/x300/x300/x300_defs.h b/firmware/usrp3/x300/x300_defs.h
index 65c5d5a23..65c5d5a23 100644
--- a/firmware/x300/x300/x300_defs.h
+++ b/firmware/usrp3/x300/x300_defs.h
diff --git a/firmware/x300/x300/x300_init.c b/firmware/usrp3/x300/x300_init.c
index 66fb120f3..66fb120f3 100644
--- a/firmware/x300/x300/x300_init.c
+++ b/firmware/usrp3/x300/x300_init.c
diff --git a/firmware/x300/x300/x300_init.h b/firmware/usrp3/x300/x300_init.h
index 324033779..324033779 100644
--- a/firmware/x300/x300/x300_init.h
+++ b/firmware/usrp3/x300/x300_init.h
diff --git a/firmware/x300/x300/x300_main.c b/firmware/usrp3/x300/x300_main.c
index d865e1d09..d865e1d09 100644
--- a/firmware/x300/x300/x300_main.c
+++ b/firmware/usrp3/x300/x300_main.c