From patchwork Mon Apr 19 23:29:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 50498 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 79325B7BEE for ; Tue, 20 Apr 2010 09:29:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753185Ab0DSX3w (ORCPT ); Mon, 19 Apr 2010 19:29:52 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:64699 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753140Ab0DSX3w (ORCPT ); Mon, 19 Apr 2010 19:29:52 -0400 Received: by mail-pv0-f174.google.com with SMTP id 18so3526406pva.19 for ; Mon, 19 Apr 2010 16:29:51 -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=J9/8I7HpVSid0rF1oyrtvr8IuwkwPn/70bpSZG3KPYk=; b=D+71ii4kuTxEcd/0awIPD3pfs6ZN4JJlXAMVLcbJ3IXeRsm4bFSe1WyQ6v5y1nOdpL ZqghTW60xi9+WCgnxbrSZC9ew/5hIFlQZxLiPde975SiprTacmNYKepYG2OUCDoU2Bhj 31+ToTWNdmRqdLgk91bY3EtWzdqjFPCWSzQ78= 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=Mt95GOJUBrYy94PtTUUsBBCvWMMifUg0d5ZAt0hjhb4NB2FVYd8BbdyU0MCrkTDCcZ Q+/NdjP7DNAmc5AG5ZMBmZEDTL8Yjn+XTydcLQ56RxDBzaJLvU0sJdclISOyGITUp5oZ sEgf8GgGktA8nT+Jw7WUp2/WsmW+33lULQkDg= Received: by 10.115.87.32 with SMTP id p32mr4841394wal.86.1271719791757; Mon, 19 Apr 2010 16:29:51 -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 23sm5922763pzk.2.2010.04.19.16.29.49 (version=SSLv3 cipher=RC4-MD5); Mon, 19 Apr 2010 16:29:51 -0700 (PDT) Subject: [PATCHv2 3/7] X25: Use identifiers for x25 async device to x25 interface From: Andrew Hendry To: netdev@vger.kernel.org Date: Tue, 20 Apr 2010 09:29:47 +1000 Message-ID: <1271719787.2802.84.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 --- drivers/net/wan/x25_asy.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 80d5c58..166e77d 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c @@ -29,12 +29,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include "x25_asy.h" #include @@ -315,15 +315,15 @@ static netdev_tx_t x25_asy_xmit(struct sk_buff *skb, } switch (skb->data[0]) { - case 0x00: + case X25_IFACE_DATA: break; - case 0x01: /* Connection request .. do nothing */ + case X25_IFACE_CONNECT: /* Connection request .. do nothing */ err = lapb_connect_request(dev); if (err != LAPB_OK) printk(KERN_ERR "x25_asy: lapb_connect_request error - %d\n", err); kfree_skb(skb); return NETDEV_TX_OK; - case 0x02: /* Disconnect request .. do nothing - hang up ?? */ + case X25_IFACE_DISCONNECT: /* do nothing - hang up ?? */ err = lapb_disconnect_request(dev); if (err != LAPB_OK) printk(KERN_ERR "x25_asy: lapb_disconnect_request error - %d\n", err); @@ -411,7 +411,7 @@ static void x25_asy_connected(struct net_device *dev, int reason) } ptr = skb_put(skb, 1); - *ptr = 0x01; + *ptr = X25_IFACE_CONNECT; skb->protocol = x25_type_trans(skb, sl->dev); netif_rx(skb); @@ -430,7 +430,7 @@ static void x25_asy_disconnected(struct net_device *dev, int reason) } ptr = skb_put(skb, 1); - *ptr = 0x02; + *ptr = X25_IFACE_DISCONNECT; skb->protocol = x25_type_trans(skb, sl->dev); netif_rx(skb);