From patchwork Fri Dec 4 21:06:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chas williams - CONTRACTOR X-Patchwork-Id: 40367 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 D8D22B7C05 for ; Sat, 5 Dec 2009 08:06:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757289AbZLDVGg (ORCPT ); Fri, 4 Dec 2009 16:06:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757287AbZLDVGf (ORCPT ); Fri, 4 Dec 2009 16:06:35 -0500 Received: from hedwig.cmf.nrl.navy.mil ([134.207.12.162]:57177 "EHLO hedwig.cmf.nrl.navy.mil" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757277AbZLDVGe (ORCPT ); Fri, 4 Dec 2009 16:06:34 -0500 Received: from cmf.nrl.navy.mil (thirdoffive.cmf.nrl.navy.mil [134.207.12.180]) by hedwig.cmf.nrl.navy.mil (8.14.2/8.14.2) with ESMTP id nB4L6WtI003731 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 4 Dec 2009 16:06:33 -0500 Received: from thirdoffive.cmf.nrl.navy.mil (chas@localhost) by cmf.nrl.navy.mil (8.14.3/8.14.3/Submit) with ESMTP id nB4L6Wc7012919; Fri, 4 Dec 2009 16:06:32 -0500 Message-Id: <200912042106.nB4L6Wc7012919@cmf.nrl.navy.mil> From: "Chas Williams (CONTRACTOR)" To: netdev@vger.kernel.org Cc: mfuentes@agenciaefe.com Reply-To: chas3@users.sourceforge.net Subject: Re: [PATCH] atm: [br2684] allow routed mode operation again In-reply-to: <200912042055.nB4Kto8M008310@cmf.nrl.navy.mil> Date: Fri, 04 Dec 2009 16:06:32 -0500 X-NRLCMF-Spam-Score: () hits=-0.001 X-NRLCMF-Virus-Scanned: No virus found X-Scanned-By: MIMEDefang 2.64 on 134.207.12.162 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org sorry this should be Signed-off-by me instead of manuel. *sigh* From: Chas Williams - CONTRACTOR atm: [br2684] allow routed mode operation again in routed mode, we don't have a hardware address so netdev_ops doesnt need to validate our hardware address via .ndo_validate_addr Reported-by: Manuel Fuentes Signed-off-by: Chas Williams - CONTRACTOR --- 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 -- 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/net/atm/br2684.c b/net/atm/br2684.c index 26a646d..c9230c3 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c @@ -554,6 +554,12 @@ static const struct net_device_ops br2684_netdev_ops = { .ndo_validate_addr = eth_validate_addr, }; +static const struct net_device_ops br2684_netdev_ops_routed = { + .ndo_start_xmit = br2684_start_xmit, + .ndo_set_mac_address = br2684_mac_addr, + .ndo_change_mtu = eth_change_mtu +}; + static void br2684_setup(struct net_device *netdev) { struct br2684_dev *brdev = BRPRIV(netdev); @@ -569,11 +575,10 @@ static void br2684_setup(struct net_device *netdev) static void br2684_setup_routed(struct net_device *netdev) { struct br2684_dev *brdev = BRPRIV(netdev); - brdev->net_dev = netdev; + brdev->net_dev = netdev; netdev->hard_header_len = 0; - - netdev->netdev_ops = &br2684_netdev_ops; + netdev->netdev_ops = &br2684_netdev_ops_routed; netdev->addr_len = 0; netdev->mtu = 1500; netdev->type = ARPHRD_PPP;