Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 781cff94 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: emac: turn off promiscuous mode by default"

parents d362820a f6cc8651

drivers/net/ethernet/msm/emac/emac_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -1339,7 +1339,7 @@ void emac_hw_start_mac(struct emac_hw *hw) 
	mac |= (CRCE | PCRCE);

	mac |= ((hw->preamble << PRLEN_SHFT) & PRLEN_BMSK);

	mac |= BROAD_EN;

	mac |= (FLCHK | PROM_MODE | RX_CHKSUM_EN);

	mac |= (FLCHK | RX_CHKSUM_EN);

	mac &= ~(HUGEN | VLAN_STRIP | TPAUSE | SIMR | HUGE | MULTI_ALL |

		 DEBUG_MODE | SINGLE_PAUSE_MODE);

drivers/net/ethernet/msm/emac/emac_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2526,8 +2526,6 @@ static int emac_probe(struct platform_device *pdev) 
	netdev->vlan_features |= NETIF_F_SG | NETIF_F_HW_CSUM |

				 NETIF_F_TSO | NETIF_F_TSO6;



	netdev->flags |= IFF_PROMISC;



	setup_timer(&adpt->emac_timer, &emac_timer_routine,

		    (unsigned long)adpt);

	INIT_WORK(&adpt->emac_task, emac_task_routine);