feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/ethernet_flow_ctrl' into 'master'

Browse Source 
ethernet:disable flow control when select l2_to_l3_copy_mode

Disable flow control when select l2_to_l3_copy_mode ,because this mode can not touch flow control watermark  .

See merge request !482
This commit is contained in:
Wu Jian Gang
2017-02-06 13:42:18 +08:00
parent b8e2edc99f 627bc23b1c
commit e8adb5ab57
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/ethernet/emac_main.c
View File

@@ -537,6 +537,10 @@ static void emac_check_phy_init(void)
} else { } else {
REG_CLR_BIT(EMAC_GMACCONFIG_REG, EMAC_GMACFESPEED); REG_CLR_BIT(EMAC_GMACCONFIG_REG, EMAC_GMACFESPEED);
} }
#if CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE
emac_disable_flowctrl();
emac_config.emac_flow_ctrl_partner_support = false;
#else
if (emac_config.emac_flow_ctrl_enable == true) { if (emac_config.emac_flow_ctrl_enable == true) {
if (emac_config.emac_phy_get_partner_pause_enable() == true && emac_config.emac_phy_get_duplex_mode() == ETH_MDOE_FULLDUPLEX) { if (emac_config.emac_phy_get_partner_pause_enable() == true && emac_config.emac_phy_get_duplex_mode() == ETH_MDOE_FULLDUPLEX) {
emac_enable_flowctrl(); emac_enable_flowctrl();
@@ -549,6 +553,7 @@ static void emac_check_phy_init(void)
emac_disable_flowctrl(); emac_disable_flowctrl();
emac_config.emac_flow_ctrl_partner_support = false; emac_config.emac_flow_ctrl_partner_support = false;
} }
#endif
emac_mac_enable_txrx(); emac_mac_enable_txrx();
} }
static void emac_process_link_updown(bool link_status) static void emac_process_link_updown(bool link_status)