From patchwork Thu Nov 20 17:59:16 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 9861 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 BCA07DDE1E for ; Fri, 21 Nov 2008 05:04:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754878AbYKTSEW (ORCPT ); Thu, 20 Nov 2008 13:04:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754433AbYKTSES (ORCPT ); Thu, 20 Nov 2008 13:04:18 -0500 Received: from suva.vyatta.com ([76.74.103.44]:53070 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752663AbYKTSEM (ORCPT ); Thu, 20 Nov 2008 13:04:12 -0500 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id mAKI4ACu001030; Thu, 20 Nov 2008 10:04:10 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id mAKI4AHv001029; Thu, 20 Nov 2008 10:04:10 -0800 Message-Id: <20081120175933.753991540@vyatta.com> References: <20081120175913.943543638@vyatta.com> User-Agent: quilt/0.46-1 Date: Thu, 20 Nov 2008 09:59:16 -0800 From: Stephen Hemminger To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH 3/9] ipmr: convert ipmr virtual interface to net_device_ops Content-Disposition: inline; filename=ipmr-netdev_ops.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Convert to new network device ops interface. Signed-off-by: Stephen Hemminger --- a/net/ipv4/ipmr.c 2008-11-20 09:14:09.000000000 -0800 +++ b/net/ipv4/ipmr.c 2008-11-20 09:15:27.000000000 -0800 @@ -222,12 +222,16 @@ static int reg_vif_xmit(struct sk_buff * return 0; } +static const struct net_device_ops reg_vif_netdev_ops = { + .ndo_start_xmit = reg_vif_xmit, +}; + static void reg_vif_setup(struct net_device *dev) { dev->type = ARPHRD_PIMREG; dev->mtu = ETH_DATA_LEN - sizeof(struct iphdr) - 8; dev->flags = IFF_NOARP; - dev->hard_start_xmit = reg_vif_xmit; + dev->netdev_ops = ®_vif_netdev_ops, dev->destructor = free_netdev; } --- a/net/ipv6/ip6mr.c 2008-11-20 09:14:08.000000000 -0800 +++ b/net/ipv6/ip6mr.c 2008-11-20 09:15:27.000000000 -0800 @@ -416,12 +416,16 @@ static int reg_vif_xmit(struct sk_buff * return 0; } +static const struct net_device_ops reg_vif_netdev_ops = { + .ndo_start_xmit = reg_vif_xmit, +}; + static void reg_vif_setup(struct net_device *dev) { dev->type = ARPHRD_PIMREG; dev->mtu = 1500 - sizeof(struct ipv6hdr) - 8; dev->flags = IFF_NOARP; - dev->hard_start_xmit = reg_vif_xmit; + dev->netdev_ops = ®_vif_netdev_ops; dev->destructor = free_netdev; }