summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-11-16 10:08:30 -0800
committerJosh Blum <josh@joshknows.com>2010-11-16 10:08:30 -0800
commit41e7d1e4026bdb9efe4430351a42ef5d7ecc152d (patch)
treeced3327048fbb5fff20f9c1c43f40c505774be03
parent6a7ef142fcd3c9036b3c7d915edf16a3ba5dc9df (diff)
parent7ffb1370f439cf9221290319247dcbc617cf9cbe (diff)
downloaduhd-41e7d1e4026bdb9efe4430351a42ef5d7ecc152d.tar.gz
uhd-41e7d1e4026bdb9efe4430351a42ef5d7ecc152d.tar.bz2
uhd-41e7d1e4026bdb9efe4430351a42ef5d7ecc152d.zip
Merge branch 'public_master'
-rw-r--r--host/lib/usrp/mboard_eeprom.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/mboard_eeprom.cpp b/host/lib/usrp/mboard_eeprom.cpp
index 1c2519291..e7470944c 100644
--- a/host/lib/usrp/mboard_eeprom.cpp
+++ b/host/lib/usrp/mboard_eeprom.cpp
@@ -64,7 +64,7 @@ static const boost::uint8_t N100_EEPROM_ADDR = 0x50;
static const uhd::dict<std::string, boost::uint8_t> USRP_N100_OFFSETS = boost::assign::map_list_of
("rev-lsb-msb", 0x00)
("mac-addr", 0x02)
- ("ip-addr", 0x08)
+ ("ip-addr", 0x0C)
//leave space here for other addresses (perhaps)
("serial", 0x18)
("name", 0x18 + SERIAL_LEN)