Hi Dave, Roland,
Today's linux-next merge of the net tree got a conflict in
drivers/infiniband/hw/nes/nes_nic.c between commit
2869975cfbd58dc6591d8c3ba1f171e7f758be28 ("RDMA/nes: Remove LLTX") from
the infiniband tree and commit d0929553bebcac828b612e7d6d239559e08feaf4
("infiniband: convert nes driver to net_device_ops") from the net tree.
Just a trivial context change (the commits deleted lines next to each
other). I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/infiniband/hw/nes/nes_nic.c
index 025ed9f,ae8c688..0000000
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@@ -1598,9 -1618,10 +1601,9 @@@ struct net_device *nes_netdev_init(stru
netif_napi_add(netdev, &nesvnic->napi, nes_netdev_poll, 128);
nes_debug(NES_DBG_INIT, "Enabling VLAN Insert/Delete.\n");
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 */
+ nesvnic = netdev_priv(netdev);
nesvnic->netdev = netdev;
nesvnic->nesdev = nesdev;
nesvnic->msg_enable = netif_msg_init(debug, default_msg);
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
