From patchwork Mon Jul 27 14:08:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 30265 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 459D6B6F20 for ; Tue, 28 Jul 2009 00:08:59 +1000 (EST) Received: by ozlabs.org (Postfix) id 3899EDDD0C; Tue, 28 Jul 2009 00:08:59 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id BD8A1DDD04 for ; Tue, 28 Jul 2009 00:08:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751326AbZG0OIk (ORCPT ); Mon, 27 Jul 2009 10:08:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751179AbZG0OIj (ORCPT ); Mon, 27 Jul 2009 10:08:39 -0400 Received: from mail-fx0-f218.google.com ([209.85.220.218]:39294 "EHLO mail-fx0-f218.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750851AbZG0OIg (ORCPT ); Mon, 27 Jul 2009 10:08:36 -0400 Received: by fxm18 with SMTP id 18so2616688fxm.37 for ; Mon, 27 Jul 2009 07:08:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=6KHKOHFBb8LDDSuIPhJ77p5r9VkRHX03O2ms5oL1dfI=; b=QLXlNoZsi18VLyedwfoJFU4KBsnYGBwlt0+EGC4p1NvI6GHQ8eiaapFwkhvaqfZRNZ iarkL5+t7UFlfVLERamOruFBc2MIAnDdM7MSWHapH81f8uCuSwoEHprvXSiF6+lH+NJW qwphAK67d0W8sQ2bnprCeQWgbsxcR7Po0RuWQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=dGBW0kOg/IfyF53t54oK0fRFEX+Fag6DG6Y4rKzR7sKmkyhr6MDBiIhzou+ngfv0y/ bob5WRgC4uSzm0NKwA4PsVoHZfiX4oSMQwpKFRqPi6PA8a2mmNN7ikowl7tiAgS6gHzS RWqc/RsAb68supMfG/3+8jHemmQZhyjFmmuTw= Received: by 10.86.98.18 with SMTP id v18mr2425638fgb.13.1248703715713; Mon, 27 Jul 2009 07:08:35 -0700 (PDT) Received: from localhost.localdomain (iap-pxy-mow1.siemens.ru [212.248.25.26]) by mx.google.com with ESMTPS id 4sm18553077fgg.7.2009.07.27.07.08.34 (version=SSLv3 cipher=RC4-MD5); Mon, 27 Jul 2009 07:08:35 -0700 (PDT) From: Dmitry Eremin-Solenikov To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-zigbee-devel@lists.sourceforge.net, Sergey Lapin Subject: [PATCH 2/3] ieee802154: move headers out of extra directory Date: Mon, 27 Jul 2009 18:08:14 +0400 Message-Id: <1248703695-7043-3-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1248703695-7043-2-git-send-email-dbaryshkov@gmail.com> References: <1248703695-7043-1-git-send-email-dbaryshkov@gmail.com> <1248703695-7043-2-git-send-email-dbaryshkov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org include/net/ieee802154/af_ieee802154.h (and others) naming seems to be too long and redundant. Drop one level of subdirectories. Signed-off-by: Dmitry Eremin-Solenikov --- drivers/ieee802154/fakehard.c | 8 ++++---- include/net/{ieee802154 => }/af_ieee802154.h | 0 include/net/{ieee802154/mac_def.h => ieee802154.h} | 4 ++-- .../netdevice.h => ieee802154_netdev.h} | 0 include/net/{ieee802154 => }/nl802154.h | 0 net/ieee802154/af_ieee802154.c | 4 ++-- net/ieee802154/dgram.c | 6 +++--- net/ieee802154/netlink.c | 6 +++--- net/ieee802154/raw.c | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename include/net/{ieee802154 => }/af_ieee802154.h (100%) rename include/net/{ieee802154/mac_def.h => ieee802154.h} (98%) rename include/net/{ieee802154/netdevice.h => ieee802154_netdev.h} (100%) rename include/net/{ieee802154 => }/nl802154.h (100%) diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c index 9ec07e8..8a52e6e 100644 --- a/drivers/ieee802154/fakehard.c +++ b/drivers/ieee802154/fakehard.c @@ -26,10 +26,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include /** * fake_get_pan_id - Retrieve the PAN ID of the device. diff --git a/include/net/ieee802154/af_ieee802154.h b/include/net/af_ieee802154.h similarity index 100% rename from include/net/ieee802154/af_ieee802154.h rename to include/net/af_ieee802154.h diff --git a/include/net/ieee802154/mac_def.h b/include/net/ieee802154.h similarity index 98% rename from include/net/ieee802154/mac_def.h rename to include/net/ieee802154.h index 8cb6846..d52685d 100644 --- a/include/net/ieee802154/mac_def.h +++ b/include/net/ieee802154.h @@ -23,8 +23,8 @@ * Dmitry Eremin-Solenikov */ -#ifndef IEEE802154_MAC_DEF_H -#define IEEE802154_MAC_DEF_H +#ifndef NET_IEEE802154_H +#define NET_IEEE802154_H #define IEEE802154_FC_TYPE_BEACON 0x0 /* Frame is beacon */ #define IEEE802154_FC_TYPE_DATA 0x1 /* Frame is data */ diff --git a/include/net/ieee802154/netdevice.h b/include/net/ieee802154_netdev.h similarity index 100% rename from include/net/ieee802154/netdevice.h rename to include/net/ieee802154_netdev.h diff --git a/include/net/ieee802154/nl802154.h b/include/net/nl802154.h similarity index 100% rename from include/net/ieee802154/nl802154.h rename to include/net/nl802154.h diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c index 3bb6bdb..69c8d92 100644 --- a/net/ieee802154/af_ieee802154.c +++ b/net/ieee802154/af_ieee802154.c @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include #include "af802154.h" diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c index 14d3984..53dd912 100644 --- a/net/ieee802154/dgram.c +++ b/net/ieee802154/dgram.c @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c index 27eda9f..a615b9d 100644 --- a/net/ieee802154/netlink.c +++ b/net/ieee802154/netlink.c @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include static unsigned int ieee802154_seq_num; diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c index fca44d5..ea8d1f1 100644 --- a/net/ieee802154/raw.c +++ b/net/ieee802154/raw.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "af802154.h"