From patchwork Fri Jan 9 23:01:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 17643 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 E5B3F4768E for ; Sat, 10 Jan 2009 10:18:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756185AbZAIXSb (ORCPT ); Fri, 9 Jan 2009 18:18:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755892AbZAIXS1 (ORCPT ); Fri, 9 Jan 2009 18:18:27 -0500 Received: from suva.vyatta.com ([76.74.103.44]:42259 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754605AbZAIXSH (ORCPT ); Fri, 9 Jan 2009 18:18:07 -0500 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n09NI00B017232; Fri, 9 Jan 2009 15:18:00 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n09NI0dP017230; Fri, 9 Jan 2009 15:18:00 -0800 Message-Id: <20090109230139.156784731@linux-foundation.org> User-Agent: quilt/0.47-1 Date: Fri, 09 Jan 2009 15:01:30 -0800 From: Stephen Hemminger To: David Miller , t.sailer@alumni.ethz.ch Cc: netdev@vger.kernel.org, linux-hams@vger.kernel.org Subject: [patch 33/45] baycom: convert to net_device_ops References: <20090109230057.575650817@linux-foundation.org> Content-Disposition: inline; filename=baycom-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: Thomas Sailer --- 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/drivers/net/hamradio/baycom_epp.c 2009-01-09 10:22:45.000000000 -0800 +++ b/drivers/net/hamradio/baycom_epp.c 2009-01-09 10:42:00.000000000 -0800 @@ -1102,6 +1102,14 @@ static int baycom_ioctl(struct net_devic /* --------------------------------------------------------------------- */ +static const struct net_device_ops baycom_netdev_ops = { + .ndo_open = epp_open, + .ndo_stop = epp_close, + .ndo_do_ioctl = baycom_ioctl, + .ndo_start_xmit = baycom_send_packet, + .ndo_set_mac_address = baycom_set_mac_address, +}; + /* * Check for a network adaptor of this type, and return '0' if one exists. * If dev->base_addr == 0, probe all likely locations. @@ -1129,16 +1137,12 @@ static void baycom_probe(struct net_devi /* * initialize the device struct */ - dev->open = epp_open; - dev->stop = epp_close; - dev->do_ioctl = baycom_ioctl; - dev->hard_start_xmit = baycom_send_packet; /* Fill in the fields of the device structure */ bc->skb = NULL; + dev->netdev_ops = &baycom_netdev_ops; dev->header_ops = &ax25_header_ops; - dev->set_mac_address = baycom_set_mac_address; dev->type = ARPHRD_AX25; /* AF_AX25 device */ dev->hard_header_len = AX25_MAX_HEADER_LEN + AX25_BPQ_HEADER_LEN;