From patchwork Mon Apr 19 23:30:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 50500 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 D996AB7D0B for ; Tue, 20 Apr 2010 09:36:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753265Ab0DSXf4 (ORCPT ); Mon, 19 Apr 2010 19:35:56 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:60119 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752884Ab0DSXfz (ORCPT ); Mon, 19 Apr 2010 19:35:55 -0400 Received: by pwj9 with SMTP id 9so3835701pwj.19 for ; Mon, 19 Apr 2010 16:35: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=B/cKeN1ZCM/DFJdsARctwUs1hzkzxbksxejTN+8W4I8=; b=rIT+hI7WjSUx6ZNXXfFgx4EtchaYpp1zbryg4IMOInFLBMwweAATs5FPdENpzjrKlm 5Dkay19ZYSMuj0YeqV3qfw9i3B/p5xp2AMcateluE7J07F0WnPvxWWwcwk7yxDTOBuQW qkmS52QTbR57kfvlnJEZjSa66Iu7i0vajKlU0= 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=UFzOM/4C6/GtaUgFj8CtPHF9KxfZPySXrVHt3woKANgHRhk3dGEKOd4ubydZqpbYIh 2iX93PnJz1PcIyUx9rIkoV51PgYN/V017tH8+/vuX4sYYDrAOA6JmWgV06fDxsynKAZM iu+GLCNU+mgvzxyMGBaMIu5C1ynzmOnzmhaVA= Received: by 10.114.33.26 with SMTP id g26mr4763527wag.216.1271719817381; Mon, 19 Apr 2010 16:30:17 -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 20sm5906862pzk.11.2010.04.19.16.30.15 (version=SSLv3 cipher=RC4-MD5); Mon, 19 Apr 2010 16:30:16 -0700 (PDT) Subject: [PATCHv2 5/7] X25: Use identifiers for cyclades device to x25 interface From: Andrew Hendry To: netdev@vger.kernel.org, acme@ghostprotocols.net Date: Tue, 20 Apr 2010 09:30:13 +1000 Message-ID: <1271719813.2802.86.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/cycx_x25.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c index cd8cb95..cf9e15f 100644 --- a/drivers/net/wan/cycx_x25.c +++ b/drivers/net/wan/cycx_x25.c @@ -634,11 +634,12 @@ static netdev_tx_t cycx_netdevice_hard_start_xmit(struct sk_buff *skb, } } else { /* chan->protocol == ETH_P_X25 */ switch (skb->data[0]) { - case 0: break; - case 1: /* Connect request */ + case X25_IFACE_DATA: + break; + case X25_IFACE_CONNECT: cycx_x25_chan_connect(dev); goto free_packet; - case 2: /* Disconnect request */ + case X25_IFACE_DISCONNECT: cycx_x25_chan_disconnect(dev); goto free_packet; default: @@ -1406,7 +1407,8 @@ static void cycx_x25_set_chan_state(struct net_device *dev, u8 state) reset_timer(dev); if (chan->protocol == ETH_P_X25) - cycx_x25_chan_send_event(dev, 1); + cycx_x25_chan_send_event(dev, + X25_IFACE_CONNECT); break; case WAN_CONNECTING: @@ -1424,7 +1426,8 @@ static void cycx_x25_set_chan_state(struct net_device *dev, u8 state) } if (chan->protocol == ETH_P_X25) - cycx_x25_chan_send_event(dev, 2); + cycx_x25_chan_send_event(dev, + X25_IFACE_DISCONNECT); netif_wake_queue(dev); break;