From 08b9b3e23081921e7d9c3ca98ca14d85d73e0614 Mon Sep 17 00:00:00 2001 From: Masayuki Ishikawa Date: Wed, 19 Dec 2018 12:43:52 +0000 Subject: [PATCH] Merged in masayuki2009/nuttx.nuttx/change_rndis_mac (pull request #791) Change rndis mac * configs/lc823450-xgevk: Change RNDIS MAC address assignment In previous implementation, mac[0] was assigned to 0xaa for RNDIS host to avoid MAC address conflicts with RNDIS device. However, I noticed that this assignment causes a random MAC address generation on ubuntu16.04 or later which is inconvenient to set up network interface. This new assignment scheme fixes this issue. Signed-off-by: Masayuki Ishikawa * configs/stm32f4discovery: Change RNDIS MAC address assignment In previous implementation, mac[0] was assigned to 0xaa for RNDIS host to avoid MAC address conflicts with RNDIS device. However, I noticed that this assignment causes a random MAC address generation on ubuntu16.04 or later which is inconvenient to set up network interface. This new assignment scheme fixes this issue. Signed-off-by: Masayuki Ishikawa * configs/viewtool-stm32f107: Change RNDIS MAC address assignment In previous implementation, mac[0] was assigned to 0xaa for RNDIS host to avoid MAC address conflicts with RNDIS device. However, I noticed that this assignment causes a random MAC address generation on ubuntu16.04 or later which is inconvenient to set up network interface. This new assignment scheme fixes this issue. Signed-off-by: Masayuki Ishikawa Approved-by: GregoryN --- configs/lc823450-xgevk/src/lc823450_bringup.c | 2 +- configs/stm32f4discovery/src/stm32_bringup.c | 2 +- configs/viewtool-stm32f107/src/stm32_max3421e.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/lc823450-xgevk/src/lc823450_bringup.c b/configs/lc823450-xgevk/src/lc823450_bringup.c index dcc52f207cc..b6f35319528 100644 --- a/configs/lc823450-xgevk/src/lc823450_bringup.c +++ b/configs/lc823450-xgevk/src/lc823450_bringup.c @@ -118,7 +118,7 @@ int lc823450_bringup(void) #if defined(CONFIG_RNDIS) && defined(CONFIG_NSH_MACADDR) uint8_t mac[6]; - mac[0] = 0xaa; /* TODO */ + mac[0] = 0xa0; /* TODO */ mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff; mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff; mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff; diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c index 345a2a67448..e107a04be74 100644 --- a/configs/stm32f4discovery/src/stm32_bringup.c +++ b/configs/stm32f4discovery/src/stm32_bringup.c @@ -429,7 +429,7 @@ int stm32_bringup(void) #if defined(CONFIG_RNDIS) && defined(CONFIG_NSH_MACADDR) uint8_t mac[6]; - mac[0] = 0xaa; /* TODO */ + mac[0] = 0xa0; /* TODO */ mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff; mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff; mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff; diff --git a/configs/viewtool-stm32f107/src/stm32_max3421e.c b/configs/viewtool-stm32f107/src/stm32_max3421e.c index 0cd562955bf..661381980df 100644 --- a/configs/viewtool-stm32f107/src/stm32_max3421e.c +++ b/configs/viewtool-stm32f107/src/stm32_max3421e.c @@ -368,7 +368,7 @@ int stm32_max3421e_setup(void) { uint8_t mac[6]; - mac[0] = 0xaa; /* TODO */ + mac[0] = 0xa0; /* TODO */ mac[1] = (CONFIG_NSH_MACADDR >> (8 * 4)) & 0xff; mac[2] = (CONFIG_NSH_MACADDR >> (8 * 3)) & 0xff; mac[3] = (CONFIG_NSH_MACADDR >> (8 * 2)) & 0xff;