From patchwork Sun Apr 18 09:53:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 50399 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 21110B7D0C for ; Sun, 18 Apr 2010 19:53:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756559Ab0DRJxy (ORCPT ); Sun, 18 Apr 2010 05:53:54 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:47339 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756503Ab0DRJxy (ORCPT ); Sun, 18 Apr 2010 05:53:54 -0400 Received: by pva18 with SMTP id 18so2510920pva.19 for ; Sun, 18 Apr 2010 02:53:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=qU62+aZvHoiOdL8AIq1/xIipLrvxWvtkTUwtHWWO3KM=; b=at+r+JMm/69eU1eMF9+cBPBt29uEs4wql7pRkrDMuav480CFwde8LiFQ0lHZWQyNgd 7li40XELzTXtV9PEcYxxshu7kausTXlDQnazukC8vj5/vvIY5Am3WPiD4h4GTYx2Vxd8 ndzJN6ryvJVV3dcheO70m1qy7AcFkvECpadBg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=irzylWJLWoTyZaeswwuxSFqBJFTxdVXrspfX4x+Wl2B2r7/LFVJ4j5z83M1Cfl/3MT jKOQoJQWZJ+B/m/ZsSWp7x2ne6jied64HYa0YVn6dSHirP2vKEOieat19q0iJcO5kR2x t1eB7kcF9yHN77fhFIHxSNCwVORfq3qGkIY+w= Received: by 10.115.64.32 with SMTP id r32mr3135913wak.15.1271584433630; Sun, 18 Apr 2010 02:53:53 -0700 (PDT) Received: from [192.168.0.2] (210-84-37-193.dyn.iinet.net.au [210.84.37.193]) by mx.google.com with ESMTPS id 20sm4280946pzk.3.2010.04.18.02.53.51 (version=SSLv3 cipher=RC4-MD5); Sun, 18 Apr 2010 02:53:53 -0700 (PDT) Subject: [PATCH 6/6] X25: Use identifiers for hdlc x25 device to x25 interface From: Andrew Hendry To: netdev@vger.kernel.org, khc@pm.waw.pl Date: Sun, 18 Apr 2010 19:53:49 +1000 Message-ID: <1271584429.6280.435.camel@ibex> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Change magic numbers to identifiers for X25 interface. Note, x25_connect_disconnect 'reason' appears unimplemented? Have left that part as is for the moment. Signed-off-by: Andrew Hendry --- drivers/net/wan/hdlc_x25.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c index c7adbb7..70527e5 100644 --- a/drivers/net/wan/hdlc_x25.c +++ b/drivers/net/wan/hdlc_x25.c @@ -49,14 +49,14 @@ static void x25_connect_disconnect(struct net_device *dev, int reason, int code) static void x25_connected(struct net_device *dev, int reason) { - x25_connect_disconnect(dev, reason, 1); + x25_connect_disconnect(dev, reason, X25_IFACE_CONNECT); } static void x25_disconnected(struct net_device *dev, int reason) { - x25_connect_disconnect(dev, reason, 2); + x25_connect_disconnect(dev, reason, X25_IFACE_DISCONNECT); } @@ -71,7 +71,7 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb) return NET_RX_DROP; ptr = skb->data; - *ptr = 0; + *ptr = X25_IFACE_DATA; skb->protocol = x25_type_trans(skb, dev); return netif_rx(skb); @@ -94,13 +94,13 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev) /* X.25 to LAPB */ switch (skb->data[0]) { - case 0: /* Data to be transmitted */ + case X25_IFACE_DATA: /* Data to be transmitted */ skb_pull(skb, 1); if ((result = lapb_data_request(dev, skb)) != LAPB_OK) dev_kfree_skb(skb); return NETDEV_TX_OK; - case 1: + case X25_IFACE_CONNECT: if ((result = lapb_connect_request(dev))!= LAPB_OK) { if (result == LAPB_CONNECTED) /* Send connect confirm. msg to level 3 */ @@ -112,7 +112,7 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev) } break; - case 2: + case X25_IFACE_DISCONNECT: if ((result = lapb_disconnect_request(dev)) != LAPB_OK) { if (result == LAPB_NOTCONNECTED) /* Send disconnect confirm. msg to level 3 */