From patchwork Fri Mar 27 19:16:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Dreier X-Patchwork-Id: 25230 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 6E3F3DDED1 for ; Sat, 28 Mar 2009 06:16:36 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756326AbZC0TQ3 (ORCPT ); Fri, 27 Mar 2009 15:16:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754248AbZC0TQ2 (ORCPT ); Fri, 27 Mar 2009 15:16:28 -0400 Received: from sj-iport-2.cisco.com ([171.71.176.71]:30867 "EHLO sj-iport-2.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753360AbZC0TQ1 (ORCPT ); Fri, 27 Mar 2009 15:16:27 -0400 X-IronPort-AV: E=Sophos;i="4.38,434,1233532800"; d="scan'208";a="147671495" Received: from sj-dkim-1.cisco.com ([171.71.179.21]) by sj-iport-2.cisco.com with ESMTP; 27 Mar 2009 19:16:26 +0000 Received: from sj-core-5.cisco.com (sj-core-5.cisco.com [171.71.177.238]) by sj-dkim-1.cisco.com (8.12.11/8.12.11) with ESMTP id n2RJGQ55014792; Fri, 27 Mar 2009 12:16:26 -0700 Received: from xbh-sjc-221.amer.cisco.com (xbh-sjc-221.cisco.com [128.107.191.63]) by sj-core-5.cisco.com (8.13.8/8.13.8) with ESMTP id n2RJGQEn011749; Fri, 27 Mar 2009 19:16:26 GMT Received: from xfe-sjc-212.amer.cisco.com ([171.70.151.187]) by xbh-sjc-221.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 27 Mar 2009 12:16:25 -0700 Received: from roland-conroe ([10.33.42.9]) by xfe-sjc-212.amer.cisco.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 27 Mar 2009 12:16:25 -0700 Received: by roland-conroe (Postfix, from userid 33217) id 328B5E7206; Fri, 27 Mar 2009 12:16:25 -0700 (PDT) From: Roland Dreier To: Linus Torvalds Cc: David Miller , Andrew Morton , netdev@vger.kernel.org, Linux Kernel Mailing List Subject: [PATCH] RDMA/nes: Fix mis-merge References: <20090326.020714.36421849.davem@davemloft.net> <20090326.152515.43533230.davem@davemloft.net> X-Message-Flag: Warning: May contain useful information Date: Fri, 27 Mar 2009 12:16:25 -0700 In-Reply-To: (Roland Dreier's message of "Thu, 26 Mar 2009 16:25:49 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) MIME-Version: 1.0 X-OriginalArrivalTime: 27 Mar 2009 19:16:25.0528 (UTC) FILETIME=[85C35B80:01C9AF10] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; l=1337; t=1238181386; x=1239045386; c=relaxed/simple; s=sjdkim1004; h=Content-Type:From:Subject:Content-Transfer-Encoding:MIME-Version; d=cisco.com; i=rdreier@cisco.com; z=From:=20Roland=20Dreier=20 |Subject:=20[PATCH]=20RDMA/nes=3A=20Fix=20mis-merge |Sender:=20; bh=mMa6fN82kx6KNwsR85/AGj7s8Ysl141rjB0+56nsI2s=; b=lbXAj6Rbwwl9t0+8/Wj6R05WK52H4bWBXz9xwrdKrXncnDO62YQ05Npatl yghRDmglJmv4uqvk8ZWcAosxLaUtQwwlEH25EV/2G3BWYt8dW06Jx/2/AJRN W/x983WIgcX/kyAssdI6XpOyNp6Pq1/YRwtkeB3T+Of/6J0UO3lDA=; Authentication-Results: sj-dkim-1; header.From=rdreier@cisco.com; dkim=pass ( sig from cisco.com/sjdkim1004 verified; ); Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. Acked-by: David S. Miller Signed-off-by: Roland Dreier --- Resending because this seems to have gotten dropped (probably because I forgot my s-o-b the first time around); in the meantime I have tested the iw_nes driver with this patch applied and it works (at least enough to run some light traffic) drivers/infiniband/hw/nes/nes_nic.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;