From patchwork Sun Apr 18 09:53:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 50397 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 CA9C8B7D0C for ; Sun, 18 Apr 2010 19:53:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756381Ab0DRJxY (ORCPT ); Sun, 18 Apr 2010 05:53:24 -0400 Received: from mail-pz0-f204.google.com ([209.85.222.204]:37498 "EHLO mail-pz0-f204.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756220Ab0DRJxX (ORCPT ); Sun, 18 Apr 2010 05:53:23 -0400 Received: by mail-pz0-f204.google.com with SMTP id 42so2815000pzk.4 for ; Sun, 18 Apr 2010 02:53:23 -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=UOMZ6rEHJwhAmv1Ty5pbZp1lBp2Ndt/n0gyQBbNB6hE=; b=wdi9TFq6RVbVvLYt0AgAVeDtwKdwgCp+mbCljq3W+MtcVY7SAHq4+9SiC6UD4JcZoP nRchBSDUBRS1ZLXL8ctWwYDEVWlDvYXsnxbcLE65pOd75cfJt509a+3Gabn/mDBtEBki C3mKxSMq7XjKxeQ39iBsI5w6uGWwsyLvbIr4A= 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=XFVgFcxu3MpN3jTTkJYUxSCNYiR/smZTwEF9PCqXJcElLuAP7E1k2Tezi+nYZdPcuE xXMCU0Y1hICiFevKG+Xvh0J8nzme6nJvlN66bR6kz9+fiNav079m7KYR6J+nE5jou6in Xr+1k0Z4l/v6kqpEjyfQKQNevrO9hRAudgaeE= Received: by 10.140.247.20 with SMTP id u20mr869064rvh.122.1271584403392; Sun, 18 Apr 2010 02:53:23 -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 23sm4278117pzk.14.2010.04.18.02.53.21 (version=SSLv3 cipher=RC4-MD5); Sun, 18 Apr 2010 02:53:22 -0700 (PDT) Subject: [PATCH 4/6] X25: Use identifiers for lapbether device to x25 interface From: Andrew Hendry To: netdev@vger.kernel.org Date: Sun, 18 Apr 2010 19:53:19 +1000 Message-ID: <1271584399.6280.432.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/lapbether.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 98e2f99..4d4dc38 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -139,7 +139,7 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb) return NET_RX_DROP; ptr = skb->data; - *ptr = 0x00; + *ptr = X25_IFACE_DATA; skb->protocol = x25_type_trans(skb, dev); return netif_rx(skb); @@ -161,14 +161,14 @@ static netdev_tx_t lapbeth_xmit(struct sk_buff *skb, goto drop; switch (skb->data[0]) { - case 0x00: + case X25_IFACE_DATA: break; - case 0x01: + case X25_IFACE_CONNECT: if ((err = lapb_connect_request(dev)) != LAPB_OK) printk(KERN_ERR "lapbeth: lapb_connect_request " "error: %d\n", err); goto drop; - case 0x02: + case X25_IFACE_DISCONNECT: if ((err = lapb_disconnect_request(dev)) != LAPB_OK) printk(KERN_ERR "lapbeth: lapb_disconnect_request " "err: %d\n", err); @@ -225,7 +225,7 @@ static void lapbeth_connected(struct net_device *dev, int reason) } ptr = skb_put(skb, 1); - *ptr = 0x01; + *ptr = X25_IFACE_CONNECT; skb->protocol = x25_type_trans(skb, dev); netif_rx(skb); @@ -242,7 +242,7 @@ static void lapbeth_disconnected(struct net_device *dev, int reason) } ptr = skb_put(skb, 1); - *ptr = 0x02; + *ptr = X25_IFACE_DISCONNECT; skb->protocol = x25_type_trans(skb, dev); netif_rx(skb);