From patchwork Mon Apr 19 23:30:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 50501 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 3A3E5B7D0E for ; Tue, 20 Apr 2010 09:37:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753241Ab0DSXhE (ORCPT ); Mon, 19 Apr 2010 19:37:04 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:55255 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752884Ab0DSXhC (ORCPT ); Mon, 19 Apr 2010 19:37:02 -0400 Received: by pwj9 with SMTP id 9so3836092pwj.19 for ; Mon, 19 Apr 2010 16:37:01 -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=awcLxBKy0cCLDiERXpWisjwksV/izw+rfBgu5f0B2L4=; b=tdcNhT6w/fLJgMvZS8TzeT8Qdm0P7YZ1sI9U2rQ59H8kTak6Iitjpe/KCDPlXzTIkq ZLb7a6dbIbXy2rSjUnNn1Hnbngq01JB89Qx+avi/mZEf1uglOg0XsKlp29GuOwwB1xdQ S6FKc717GQdCD5BbgTYHURpIwdK52oOJTx0Q4= 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=A6ZcREx7an7aYuOuZPUpLvbLxIWZz0TGoXngvgKGb03kL9Xh56bnzKh0z04fJp+amY lfurBaL0rQykU/W75JE/F19MTE01ETz9Rw4YteS8z225MogzQ3Wy7sxL+sg5oxq7bo9v kJ3dRzXh62Hom+lzfyYzF9ve9I826c9/UAwjk= Received: by 10.141.107.16 with SMTP id j16mr1735112rvm.2.1271719806456; Mon, 19 Apr 2010 16:30:06 -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 22sm5914515pzk.1.2010.04.19.16.30.04 (version=SSLv3 cipher=RC4-MD5); Mon, 19 Apr 2010 16:30:05 -0700 (PDT) Subject: [PATCHv2 4/7] X25: Use identifiers for lapbether device to x25 interface From: Andrew Hendry To: netdev@vger.kernel.org Date: Tue, 20 Apr 2010 09:30:02 +1000 Message-ID: <1271719802.2802.85.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);