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

Commit 7c757eb9 authored by Roland Dreier's avatar Roland Dreier Committed by Linus Torvalds
Browse files

RDMA/nes: Fix mis-merge 



When net-next and infiniband were merged upstream, each branch deleted
one of a pair of adjacent lines from nes_nic.c, but when Linus fixed the
conflict up, he brought back both of the lines.  Fix up to the intended
final tree state.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e2ab3dff

drivers/infiniband/hw/nes/nes_nic.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1602,8 +1602,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev, 
	netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);

	netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);

	nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");

	nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");

	netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;

	netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;

	netdev->vlan_rx_register = nes_netdev_vlan_rx_register;

	netdev->features |= NETIF_F_LLTX;





	/* Fill in the port structure */

	/* Fill in the port structure */

	nesvnic->netdev = netdev;

	nesvnic->netdev = netdev;