[lkml]   [2009]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    SubjectRDMA/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.
    > Well, I merged infiniband, and that caused more conflicts. I fixed them
    > up, but people need to double-check my fixes.

    Looks like you mismerged one file -- each side deleted one line right
    next to each other, but your merge left both lines in. I think the
    patch below is needed. (The cxgb3 fix looks correct)

    drivers/infiniband/hw/nes/nes_nic.c | 2 --
    1 files changed, 0 insertions(+), 2 deletions(-)

    diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
    index 8d3e4c6..ecb1f6f 100644
    --- a/drivers/infiniband/hw/nes/nes_nic.c
    +++ b/drivers/infiniband/hw/nes/nes_nic.c
    @@ -1602,8 +1602,6 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
    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 = netdev;

     \ /
      Last update: 2009-03-27 00:29    [W:0.022 / U:88.804 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site