From patchwork Wed Jun 3 10:51:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 28054 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 9A81AB707C for ; Wed, 3 Jun 2009 20:55:09 +1000 (EST) Received: by ozlabs.org (Postfix) id 5D3C8DE380; Wed, 3 Jun 2009 20:52:25 +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 EAB58DE136 for ; Wed, 3 Jun 2009 20:52:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753918AbZFCKwK (ORCPT ); Wed, 3 Jun 2009 06:52:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753451AbZFCKwJ (ORCPT ); Wed, 3 Jun 2009 06:52:09 -0400 Received: from fg-out-1718.google.com ([72.14.220.156]:27100 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753440AbZFCKwH (ORCPT ); Wed, 3 Jun 2009 06:52:07 -0400 Received: by fg-out-1718.google.com with SMTP id 16so3345818fgg.17 for ; Wed, 03 Jun 2009 03:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=4rV+ENGu57q+bHoH7jsq877sjwvAByRcBsCIvGmWwDk=; b=vnwLf8x54kLfecu3ntY6yJoGt+7cOJYDgnzaakpNRnkO0I62BBb01JObTzN+x4Fh/l tZG7rerF+iVvfp5psdReDqEu1BRpqJZjVOLhR2R85HSROuMEjzCRfQkpXXv3u6tBdt2f 0xOjfWBJnPbdgMHZHGVEhVYgxtc4CbNSuqa+s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=qdQpNCAq0k0W7OdmRlPAy2m8tI5S4UCuVP38nkix1UInGZlqJM0qi3ravJgyMMF4MG N7/bup9KTIK5wqqO+rsgP4MzuNagqL41HAL47VkP3OfIoJVJoCnWYf1oz9DD9S9pO+GU 3mr7DJ7jTCWoiJIGHbJSxsBMNXXKiivKsa3g0= Received: by 10.86.59.2 with SMTP id h2mr926288fga.73.1244026326003; Wed, 03 Jun 2009 03:52:06 -0700 (PDT) Received: from doriath.ww600.siemens.net (iap-pxy-mow1.siemens.ru [212.248.25.26]) by mx.google.com with ESMTPS id d6sm16368393fga.17.2009.06.03.03.52.03 (version=SSLv3 cipher=RC4-MD5); Wed, 03 Jun 2009 03:52:05 -0700 (PDT) Date: Wed, 3 Jun 2009 14:51:51 +0400 From: Dmitry Eremin-Solenikov To: David Miller Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, sfr@canb.auug.org.au, slapin@ossfans.org Subject: Re: [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack Message-ID: <20090603105151.GA20508@doriath.ww600.siemens.net> References: <1244021629-18409-1-git-send-email-dbaryshkov@gmail.com> <1244021629-18409-2-git-send-email-dbaryshkov@gmail.com> <1244021629-18409-3-git-send-email-dbaryshkov@gmail.com> <20090603.030826.03512651.davem@davemloft.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090603.030826.03512651.davem@davemloft.net> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Jun 03, 2009 at 03:08:26AM -0700, David Miller wrote: > From: Dmitry Eremin-Solenikov > Date: Wed, 3 Jun 2009 13:33:45 +0400 > > > IEEE 802.15.4/ZigBee stack requires several constants to be defined/adjusted. > > > > Signed-off-by: Dmitry Eremin-Solenikov > > Signed-off-by: Sergey Lapin > > --- > > include/linux/if.h | 2 ++ > > include/linux/if_arp.h | 2 ++ > > include/linux/if_ether.h | 2 ++ > > include/linux/socket.h | 6 +++++- > > net/core/dev.c | 6 ++++-- > > net/core/sock.c | 3 +++ > > 6 files changed, 18 insertions(+), 3 deletions(-) > > > > diff --git a/include/linux/if.h b/include/linux/if.h > > index 1108f3e..3f574b8 100644 > > --- a/include/linux/if.h > > +++ b/include/linux/if.h > > @@ -68,6 +68,8 @@ > > #define IFF_MASTER_ARPMON 0x100 /* bonding master, ARP mon in use */ > > #define IFF_WAN_HDLC 0x200 /* WAN HDLC device */ > > > > +#define IFF_IEEE802154_COORD 0x100 /* IEEE802.15.4 PAN coordinator */ > > + > > #define IF_GET_IFACE 0x0001 /* for querying only */ > > #define IF_GET_PROTO 0x0002 > > > > This constant isn't used by any of these patches, and it's > value overlaps that of IFF_MASTER_ARPMON so would need to be > changed anyways. > > I didn't check if other things in this patch turn out to > be unused as well, please audit that. Please check the updated patch. We do request several unused in this serie value (like AF_ZIGBEE), but we'd like for them to be merged ASAP as their are a part of ABI. From cda453105a17d8e97c57a25dacbdc0fc82a90f71 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Wed, 3 Jun 2009 14:43:38 +0400 Subject: [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack IEEE 802.15.4/ZigBee stack requires several constants to be defined/adjusted. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Sergey Lapin --- include/linux/if_arp.h | 2 ++ include/linux/if_ether.h | 2 ++ include/linux/socket.h | 6 +++++- net/core/dev.c | 6 ++++-- net/core/sock.c | 3 +++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index 5ff8980..b554300 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -86,6 +86,8 @@ #define ARPHRD_IEEE80211 801 /* IEEE 802.11 */ #define ARPHRD_IEEE80211_PRISM 802 /* IEEE 802.11 + Prism2 header */ #define ARPHRD_IEEE80211_RADIOTAP 803 /* IEEE 802.11 + radiotap header */ +#define ARPHRD_IEEE802154 804 +#define ARPHRD_IEEE802154_PHY 805 #define ARPHRD_PHONET 820 /* PhoNet media type */ #define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */ diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index cfe4fe1..0a08e92 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -106,6 +106,8 @@ #define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ #define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ #define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ +#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */ +#define ETH_P_IEEE802154_MAC 0x00F7 /* IEEE802.15.4 MAC frame */ /* * This is an Ethernet frame header. diff --git a/include/linux/socket.h b/include/linux/socket.h index 421afb4..09d792e 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -194,7 +194,9 @@ struct ucred { #define AF_RXRPC 33 /* RxRPC sockets */ #define AF_ISDN 34 /* mISDN sockets */ #define AF_PHONET 35 /* Phonet sockets */ -#define AF_MAX 36 /* For now.. */ +#define AF_IEEE802154 36 /* IEEE802154 sockets */ +#define AF_ZIGBEE 37 /* ZIGBEE sockets */ +#define AF_MAX 38 /* For now.. */ /* Protocol families, same as address families. */ #define PF_UNSPEC AF_UNSPEC @@ -233,6 +235,8 @@ struct ucred { #define PF_RXRPC AF_RXRPC #define PF_ISDN AF_ISDN #define PF_PHONET AF_PHONET +#define PF_IEEE802154 AF_IEEE802154 +#define PF_ZIGBEE AF_ZIGBEE #define PF_MAX AF_MAX /* Maximum queue length specifiable by listen. */ diff --git a/net/core/dev.c b/net/core/dev.c index e2e9e4a..4119dfc 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -268,7 +268,8 @@ static const unsigned short netdev_lock_type[] = ARPHRD_IRDA, ARPHRD_FCPP, ARPHRD_FCAL, ARPHRD_FCPL, ARPHRD_FCFABRIC, ARPHRD_IEEE802_TR, ARPHRD_IEEE80211, ARPHRD_IEEE80211_PRISM, ARPHRD_IEEE80211_RADIOTAP, ARPHRD_PHONET, - ARPHRD_PHONET_PIPE, ARPHRD_VOID, ARPHRD_NONE}; + ARPHRD_PHONET_PIPE, ARPHRD_IEEE802154, ARPHRD_IEEE802154_PHY, + ARPHRD_VOID, ARPHRD_NONE}; static const char *netdev_lock_name[] = {"_xmit_NETROM", "_xmit_ETHER", "_xmit_EETHER", "_xmit_AX25", @@ -285,7 +286,8 @@ static const char *netdev_lock_name[] = "_xmit_IRDA", "_xmit_FCPP", "_xmit_FCAL", "_xmit_FCPL", "_xmit_FCFABRIC", "_xmit_IEEE802_TR", "_xmit_IEEE80211", "_xmit_IEEE80211_PRISM", "_xmit_IEEE80211_RADIOTAP", "_xmit_PHONET", - "_xmit_PHONET_PIPE", "_xmit_VOID", "_xmit_NONE"}; + "_xmit_PHONET_PIPE", "_xmit_IEEE802154", "_xmit_IEEE802154_PHY", + "_xmit_VOID", "_xmit_NONE"}; static struct lock_class_key netdev_xmit_lock_key[ARRAY_SIZE(netdev_lock_type)]; static struct lock_class_key netdev_addr_lock_key[ARRAY_SIZE(netdev_lock_type)]; diff --git a/net/core/sock.c b/net/core/sock.c index 7dbf3ff..72d593b 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -155,6 +155,7 @@ static const char *af_family_key_strings[AF_MAX+1] = { "sk_lock-27" , "sk_lock-28" , "sk_lock-AF_CAN" , "sk_lock-AF_TIPC" , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV" , "sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN" , "sk_lock-AF_PHONET" , + "sk_lock-AF_IEEE802154", "sk_lock-AF_ZIGBEE", "sk_lock-AF_MAX" }; static const char *af_family_slock_key_strings[AF_MAX+1] = { @@ -170,6 +171,7 @@ static const char *af_family_slock_key_strings[AF_MAX+1] = { "slock-27" , "slock-28" , "slock-AF_CAN" , "slock-AF_TIPC" , "slock-AF_BLUETOOTH", "slock-AF_IUCV" , "slock-AF_RXRPC" , "slock-AF_ISDN" , "slock-AF_PHONET" , + "slock-AF_IEEE802154", "slock-AF_ZIGBEE", "slock-AF_MAX" }; static const char *af_family_clock_key_strings[AF_MAX+1] = { @@ -185,6 +187,7 @@ static const char *af_family_clock_key_strings[AF_MAX+1] = { "clock-27" , "clock-28" , "clock-AF_CAN" , "clock-AF_TIPC" , "clock-AF_BLUETOOTH", "clock-AF_IUCV" , "clock-AF_RXRPC" , "clock-AF_ISDN" , "clock-AF_PHONET" , + "clock-AF_IEEE802154", "clock-AF_ZIGBEE", "clock-AF_MAX" };