From patchwork Thu Nov 20 05:27:16 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 9681 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 484E1DDDEE for ; Thu, 20 Nov 2008 16:27:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753050AbYKTF1Q (ORCPT ); Thu, 20 Nov 2008 00:27:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753037AbYKTF1Q (ORCPT ); Thu, 20 Nov 2008 00:27:16 -0500 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:51468 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752962AbYKTF1Q (ORCPT ); Thu, 20 Nov 2008 00:27:16 -0500 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 53C26C8C183; Wed, 19 Nov 2008 21:27:16 -0800 (PST) Date: Wed, 19 Nov 2008 21:27:16 -0800 (PST) Message-Id: <20081119.212716.85235118.davem@davemloft.net> To: shemminger@vyatta.com Cc: netdev@vger.kernel.org Subject: Re: [PATCH 01/33] netdev: network device operations infrastructure From: David Miller In-Reply-To: <20081119.212650.102527885.davem@davemloft.net> References: <20081117234207.854110282@vyatta.com> <20081117234354.864259203@vyatta.com> <20081119.212650.102527885.davem@davemloft.net> X-Mailer: Mew version 6.1 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Miller Date: Wed, 19 Nov 2008 21:26:50 -0800 (PST) > Ok, I'm applying this but it needs the following interdiff to cure some > build failures. Durrr! And here is that interdiff! --- 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 --- net/core/dev.c~ 2008-11-19 17:36:28.000000000 -0800 +++ net/core/dev.c 2008-11-19 17:36:56.000000000 -0800 @@ -4037,7 +4037,9 @@ int register_netdevice(struct net_device dev->vlan_rx_register = ops->vlan_rx_register; dev->vlan_rx_add_vid = ops->vlan_rx_add_vid; dev->vlan_rx_kill_vid = ops->vlan_rx_kill_vid; +#ifdef CONFIG_NET_POLL_CONTROLLER dev->poll_controller = ops->poll_controller; +#endif } else { char drivername[64]; pr_info("%s (%s): not using net_device_ops yet\n",