From patchwork Fri Jan 9 23:01:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 17674 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 9CCC047626 for ; Sat, 10 Jan 2009 10:23:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757859AbZAIXXL (ORCPT ); Fri, 9 Jan 2009 18:23:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760437AbZAIXXE (ORCPT ); Fri, 9 Jan 2009 18:23:04 -0500 Received: from suva.vyatta.com ([76.74.103.44]:44994 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932825AbZAIXW5 (ORCPT ); Fri, 9 Jan 2009 18:22:57 -0500 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n09NHrNI017040; Fri, 9 Jan 2009 15:17:53 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n09NHrjJ017039; Fri, 9 Jan 2009 15:17:53 -0800 Message-Id: <20090109230137.222386644@linux-foundation.org> User-Agent: quilt/0.47-1 Date: Fri, 09 Jan 2009 15:01:04 -0800 From: Stephen Hemminger To: David Miller , Ralf Baechle Cc: netdev@vger.kernel.org, linux-hams@vger.kernel.org Subject: [patch 07/45] netrom: convert to net_device_ops References: <20090109230057.575650817@linux-foundation.org> Content-Disposition: inline; filename=netrom-netdev.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stephen Hemminger Acked-by: Ralf Baechle --- include/net/netrom.h | 4 ---- net/netrom/af_netrom.c | 4 ++-- net/netrom/nr_dev.c | 26 +++++++++----------------- 3 files changed, 11 insertions(+), 23 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 --- a/net/netrom/nr_dev.c 2009-01-09 13:35:18.000000000 -0800 +++ b/net/netrom/nr_dev.c 2009-01-09 13:36:18.000000000 -0800 @@ -191,19 +191,21 @@ static const struct header_ops nr_header .rebuild= nr_rebuild_header, }; +static const struct net_device_ops nr_netdev_ops = { + .ndo_open = nr_open, + .ndo_stop = nr_close, + .ndo_start_xmit = nr_xmit, + .ndo_set_mac_address = nr_set_mac_address, +}; void nr_setup(struct net_device *dev) { dev->mtu = NR_MAX_PACKET_SIZE; - dev->hard_start_xmit = nr_xmit; - dev->open = nr_open; - dev->stop = nr_close; - + dev->netdev_ops = &nr_netdev_ops; dev->header_ops = &nr_header_ops; dev->hard_header_len = NR_NETWORK_LEN + NR_TRANSPORT_LEN; dev->addr_len = AX25_ADDR_LEN; dev->type = ARPHRD_NETROM; - dev->set_mac_address = nr_set_mac_address; /* New-style flags. */ dev->flags = IFF_NOARP;