sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in masayuki2009/nuttx.nuttx/change_rndis_mac (pull request #791)

Browse Source 
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 <Masayuki.Ishikawa@jp.sony.com>

* 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 <Masayuki.Ishikawa@jp.sony.com>

* 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 <Masayuki.Ishikawa@jp.sony.com>

Approved-by: GregoryN <gnutt@nuttx.org>
This commit is contained in:
Masayuki Ishikawa 2018-12-19 12:43:52 +00:00 committed by GregoryN
parent db24306435
commit 08b9b3e230
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/lc823450-xgevk/src/lc823450_bringup.c
View File

@ -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;

2
configs/stm32f4discovery/src/stm32_bringup.c
View File

@ -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;

2
configs/viewtool-stm32f107/src/stm32_max3421e.c
View File

@ -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;