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

Commit d8e4aa07 authored by David S. Miller's avatar David S. Miller
Browse files

mv643xx_eth: Fix merge error. 



One merge conflict block wasn't resolved.

Reported-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a6ce1e3

drivers/net/ethernet/marvell/mv643xx_eth.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -3220,15 +3220,12 @@ static int mv643xx_eth_probe(struct platform_device *pdev) 
	dev->priv_flags |= IFF_UNICAST_FLT;

	dev->priv_flags |= IFF_UNICAST_FLT;

	dev->gso_max_segs = MV643XX_MAX_TSO_SEGS;

	dev->gso_max_segs = MV643XX_MAX_TSO_SEGS;





<<<<<<< HEAD

	/* MTU range: 64 - 9500 */

	/* MTU range: 64 - 9500 */

	dev->min_mtu = 64;

	dev->min_mtu = 64;

	dev->max_mtu = 9500;

	dev->max_mtu = 9500;





	SET_NETDEV_DEV(dev, &pdev->dev);

	SET_NETDEV_DEV(dev, &pdev->dev);





=======

>>>>>>> 2a26d99b251b8625d27aed14e97fc10707a3a81f

	if (mp->shared->win_protect)

	if (mp->shared->win_protect)

		wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);

		wrl(mp, WINDOW_PROTECT(mp->port_num), mp->shared->win_protect);