From patchwork Mon Apr 19 23:30:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 50502 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 D895EB7D0E for ; Tue, 20 Apr 2010 09:37:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753274Ab0DSXhJ (ORCPT ); Mon, 19 Apr 2010 19:37:09 -0400 Received: from mail-pz0-f196.google.com ([209.85.222.196]:47754 "EHLO mail-pz0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753266Ab0DSXhI (ORCPT ); Mon, 19 Apr 2010 19:37:08 -0400 X-Greylist: delayed 421 seconds by postgrey-1.27 at vger.kernel.org; Mon, 19 Apr 2010 19:37:08 EDT Received: by pzk34 with SMTP id 34so243006pzk.33 for ; Mon, 19 Apr 2010 16:37:08 -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=pfbNE5CXWIafNXF0pmouhWzXhC1m1wTZBRGYksPtpoY=; b=OFciWF0PP9tV9OaQw3Y7CZwdoxk0ValwrNlckBz5Dzroi8DYaVGQIQX03BtqDMtKJ/ pmfOdn2H4JBShXB/slmAJgmst8YI29Gos+p5VRxcDCcnnYz0c9qPUyxw1YQkg2hlC3W1 544ygmbSmt6XxNMU3f/ItX0m83A13ao9kFkmg= 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=RaOiWxvZD+PgoN5xu5XIEWQnPi0dxQEMwoC/EUzyGkMtt1sd2Wp/rJEfAK0rcyMxU4 lUr0jMLttOdvdI5IXgpRwH916APVr43uCugfxpn7LTb5lEZNI6KXBU1UFL36h8+IoIvo 7R96YL3wtUta+UMEBOawiRPvJldG+MFXuOhuQ= Received: by 10.142.74.1 with SMTP id w1mr2522783wfa.258.1271719829119; Mon, 19 Apr 2010 16:30:29 -0700 (PDT) Received: from [192.168.0.8] (210-84-37-193.dyn.iinet.net.au [210.84.37.193]) by mx.google.com with ESMTPS id 23sm5909717pzk.10.2010.04.19.16.30.27 (version=SSLv3 cipher=RC4-MD5); Mon, 19 Apr 2010 16:30:28 -0700 (PDT) Subject: [PATCHv2 6/7] X25: Use identifiers for hdlc x25 device to x25 interface From: Andrew Hendry To: netdev@vger.kernel.org, khc@pm.waw.pl Date: Tue, 20 Apr 2010 09:30:24 +1000 Message-ID: <1271719824.2802.87.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. Signed-off-by: Andrew Hendry Acked-by: Krzysztof Halasa --- 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 */