* [MERGE REQUEST] IEEE 802.15.4 stack: generic parts
@ 2009-06-03 9:33 Dmitry Eremin-Solenikov
2009-06-03 9:33 ` [PATCH 1/6] crc-itu-t: add bit-reversed calculation Dmitry Eremin-Solenikov
0 siblings, 1 reply; 30+ messages in thread
From: Dmitry Eremin-Solenikov @ 2009-06-03 9:33 UTC (permalink / raw)
To: linux-kernel
Cc: netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin
Hello,
As generic parts of our IEEE 802.15.4 stack are now more or less stable,
we'd like to merge them into mainline Linux kernel. I've prepared a branch
on the git.kernel.org that contains changes we'd like to get in at first
step. What should we do? Should this be included into linux-next? Should
this be submitted directly to Dave Miller?
The following changes since commit 59a3759d0fe8d969888c741bb33f4946e4d3750d:
Linus Torvalds (1):
Linux 2.6.30-rc7
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git for-next
Darren Salt (1):
crc-itu-t: add bit-reversed calculation
Dmitry Eremin-Solenikov (5):
Add constants for the ieee 802.15.4/ZigBee stack
net: add IEEE 802.15.4 socket family implementation
net: add NL802154 interface for configuration of 802.15.4 devices
ieee802154: add documentation about our stack
ieee802154: add simple HardMAC driver sample
Documentation/networking/ieee802154.txt | 76 +++++
MAINTAINERS | 12 +
drivers/Makefile | 1 +
drivers/ieee802154/Kconfig | 21 ++
drivers/ieee802154/Makefile | 3 +
drivers/ieee802154/fakehard.c | 258 ++++++++++++++++
drivers/net/Kconfig | 2 +
include/linux/crc-itu-t.h | 10 +
include/linux/if.h | 2 +
include/linux/if_arp.h | 2 +
include/linux/if_ether.h | 2 +
include/linux/socket.h | 6 +-
include/net/ieee802154/af_ieee802154.h | 60 ++++
include/net/ieee802154/mac_def.h | 158 ++++++++++
include/net/ieee802154/netdevice.h | 84 ++++++
include/net/ieee802154/nl802154.h | 165 +++++++++++
lib/crc-itu-t.c | 18 ++
net/Kconfig | 1 +
net/Makefile | 1 +
net/core/dev.c | 6 +-
net/core/sock.c | 3 +
net/ieee802154/Kconfig | 12 +
net/ieee802154/Makefile | 5 +
net/ieee802154/af802154.h | 35 +++
net/ieee802154/af_ieee802154.c | 356 +++++++++++++++++++++++
net/ieee802154/dgram.c | 373 ++++++++++++++++++++++++
net/ieee802154/netlink.c | 485 +++++++++++++++++++++++++++++++
net/ieee802154/raw.c | 250 ++++++++++++++++
28 files changed, 2404 insertions(+), 3 deletions(-)
create mode 100644 Documentation/networking/ieee802154.txt
create mode 100644 drivers/ieee802154/Kconfig
create mode 100644 drivers/ieee802154/Makefile
create mode 100644 drivers/ieee802154/fakehard.c
create mode 100644 include/net/ieee802154/af_ieee802154.h
create mode 100644 include/net/ieee802154/mac_def.h
create mode 100644 include/net/ieee802154/netdevice.h
create mode 100644 include/net/ieee802154/nl802154.h
create mode 100644 net/ieee802154/Kconfig
create mode 100644 net/ieee802154/Makefile
create mode 100644 net/ieee802154/af802154.h
create mode 100644 net/ieee802154/af_ieee802154.c
create mode 100644 net/ieee802154/dgram.c
create mode 100644 net/ieee802154/netlink.c
create mode 100644 net/ieee802154/raw.c
^ permalink raw reply [flat|nested] 30+ messages in thread* [PATCH 1/6] crc-itu-t: add bit-reversed calculation 2009-06-03 9:33 [MERGE REQUEST] IEEE 802.15.4 stack: generic parts Dmitry Eremin-Solenikov @ 2009-06-03 9:33 ` Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack Dmitry Eremin-Solenikov 2009-06-03 12:43 ` [PATCH 1/6] crc-itu-t: add bit-reversed calculation Ben Hutchings 0 siblings, 2 replies; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 9:33 UTC (permalink / raw) To: linux-kernel Cc: netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Darren Salt From: Darren Salt <linux@youmustbejoking.demon.co.uk> Signed-off-by: Darren Salt <linux@youmustbejoking.demon.co.uk> --- include/linux/crc-itu-t.h | 10 ++++++++++ lib/crc-itu-t.c | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/include/linux/crc-itu-t.h b/include/linux/crc-itu-t.h index 84920f3..7b2b7ba 100644 --- a/include/linux/crc-itu-t.h +++ b/include/linux/crc-itu-t.h @@ -6,6 +6,9 @@ * Poly 0x0x1021 (x^16 + x^12 + x^15 + 1) * Init 0 * + * The bit-reversed buffer variants may be non-standard, but some firmware + * loaders require them. + * * This source code is licensed under the GNU General Public License, * Version 2. See the file COPYING for more details. */ @@ -14,15 +17,22 @@ #define CRC_ITU_T_H #include <linux/types.h> +#include <linux/bitrev.h> extern u16 const crc_itu_t_table[256]; extern u16 crc_itu_t(u16 crc, const u8 *buffer, size_t len); +extern u16 crc_itu_t_bitreversed(u16 crc, const u8 *buffer, size_t len); static inline u16 crc_itu_t_byte(u16 crc, const u8 data) { return (crc << 8) ^ crc_itu_t_table[((crc >> 8) ^ data) & 0xff]; } +static inline u16 crc_itu_t_bitreversed_byte(u16 crc, const u8 data) +{ + return (crc << 8) ^ crc_itu_t_table[((crc >> 8) ^ bitrev8(data)) & 0xff]; +} + #endif /* CRC_ITU_T_H */ diff --git a/lib/crc-itu-t.c b/lib/crc-itu-t.c index a63472b..5562fdd 100644 --- a/lib/crc-itu-t.c +++ b/lib/crc-itu-t.c @@ -64,6 +64,24 @@ u16 crc_itu_t(u16 crc, const u8 *buffer, size_t len) } EXPORT_SYMBOL(crc_itu_t); +/** + * crc_itu_t_bitreversed - Compute the CRC-ITU-T for the data buffer; + * the buffer content is assumed to be bit-reversed + * + * @crc: previous CRC value + * @buffer: data pointer + * @len: number of bytes in the buffer + * + * Returns the updated CRC value + */ +u16 crc_itu_t_bitreversed(u16 crc, const u8 *buffer, size_t len) +{ + while (len--) + crc = crc_itu_t_bitreversed_byte(crc, *buffer++); + return crc; +} +EXPORT_SYMBOL(crc_itu_t_bitreversed); + MODULE_DESCRIPTION("CRC ITU-T V.41 calculations"); MODULE_LICENSE("GPL"); -- 1.6.3.1 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack 2009-06-03 9:33 ` [PATCH 1/6] crc-itu-t: add bit-reversed calculation Dmitry Eremin-Solenikov @ 2009-06-03 9:33 ` Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 3/6] net: add IEEE 802.15.4 socket family implementation Dmitry Eremin-Solenikov 2009-06-03 10:08 ` [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack David Miller 2009-06-03 12:43 ` [PATCH 1/6] crc-itu-t: add bit-reversed calculation Ben Hutchings 1 sibling, 2 replies; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 9:33 UTC (permalink / raw) To: linux-kernel Cc: netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Dmitry Eremin-Solenikov IEEE 802.15.4/ZigBee stack requires several constants to be defined/adjusted. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Sergey Lapin <slapin@ossfans.org> --- 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 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" }; -- 1.6.3.1 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH 3/6] net: add IEEE 802.15.4 socket family implementation 2009-06-03 9:33 ` [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack Dmitry Eremin-Solenikov @ 2009-06-03 9:33 ` Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices Dmitry Eremin-Solenikov 2009-06-03 10:08 ` [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack David Miller 1 sibling, 1 reply; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 9:33 UTC (permalink / raw) To: linux-kernel Cc: netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Dmitry Eremin-Solenikov Add support for communication over IEEE 802.15.4 networks. This implementation is neither certified nor complete, but aims to that goal. This commit contains only the socket interface for communication over IEEE 802.15.4 networks. One can either send RAW datagrams or use SOCK_DGRAM to encapsulate data inside normal IEEE 802.15.4 packets. Configuration interface, drivers and software MAC 802.15.4 implementation will follow. Initial implementation was done by Maxim Gorbachyov, Maxim Osipov and Pavel Smolensky as a research project at Siemens AG. Later the stack was heavily reworked to better suit the linux networking model, and is now maitained as an open project partially sponsored by Siemens. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Sergey Lapin <slapin@ossfans.org> --- include/net/ieee802154/af_ieee802154.h | 60 +++++ include/net/ieee802154/mac_def.h | 158 ++++++++++++++ include/net/ieee802154/netdevice.h | 84 +++++++ net/Kconfig | 1 + net/Makefile | 1 + net/ieee802154/Kconfig | 12 + net/ieee802154/Makefile | 4 + net/ieee802154/af802154.h | 35 +++ net/ieee802154/af_ieee802154.c | 356 ++++++++++++++++++++++++++++++ net/ieee802154/dgram.c | 373 ++++++++++++++++++++++++++++++++ net/ieee802154/raw.c | 250 +++++++++++++++++++++ 11 files changed, 1334 insertions(+), 0 deletions(-) create mode 100644 include/net/ieee802154/af_ieee802154.h create mode 100644 include/net/ieee802154/mac_def.h create mode 100644 include/net/ieee802154/netdevice.h create mode 100644 net/ieee802154/Kconfig create mode 100644 net/ieee802154/Makefile create mode 100644 net/ieee802154/af802154.h create mode 100644 net/ieee802154/af_ieee802154.c create mode 100644 net/ieee802154/dgram.c create mode 100644 net/ieee802154/raw.c diff --git a/include/net/ieee802154/af_ieee802154.h b/include/net/ieee802154/af_ieee802154.h new file mode 100644 index 0000000..874f1e7 --- /dev/null +++ b/include/net/ieee802154/af_ieee802154.h @@ -0,0 +1,60 @@ +/* + * IEEE 802.15.4 inteface for userspace + * + * Copyright 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Sergey Lapin <sergey.lapin@siemens.com> + * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> + */ + +#ifndef _AF_IEEE802154_H +#define _AF_IEEE802154_H + +#include <linux/socket.h> /* for sa_family_t */ + +enum { + IEEE802154_ADDR_NONE = 0x0, + /* RESERVED = 0x01, */ + IEEE802154_ADDR_SHORT = 0x2, /* 16-bit address + PANid */ + IEEE802154_ADDR_LONG = 0x3, /* 64-bit address + PANid */ +}; + +/* address length, octets */ +#define IEEE802154_ADDR_LEN 8 + +struct ieee802154_addr { + int addr_type; + u16 pan_id; + union { + u8 hwaddr[IEEE802154_ADDR_LEN]; + u16 short_addr; + }; +}; + +#define IEEE802154_PANID_BROADCAST 0xffff +#define IEEE802154_ADDR_BROADCAST 0xffff +#define IEEE802154_ADDR_UNDEF 0xfffe + +struct sockaddr_ieee802154 { + sa_family_t family; /* AF_IEEE802154 */ + struct ieee802154_addr addr; +}; + +/* master device */ +#define IEEE802154_SIOC_ADD_SLAVE (SIOCDEVPRIVATE + 0) + +#endif diff --git a/include/net/ieee802154/mac_def.h b/include/net/ieee802154/mac_def.h new file mode 100644 index 0000000..0d92393 --- /dev/null +++ b/include/net/ieee802154/mac_def.h @@ -0,0 +1,158 @@ +/* + * IEEE802.15.4-2003 specification + * + * Copyright (C) 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Pavel Smolenskiy <pavel.smolenskiy@gmail.com> + * Maxim Gorbachyov <maxim.gorbachev@siemens.com> + * Maxim Osipov <maxim.osipov@siemens.com> + * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> + */ + +#ifndef IEEE802154_MAC_DEF_H +#define IEEE802154_MAC_DEF_H + +#define IEEE802154_FC_TYPE_BEACON 0x0 /* Frame is beacon */ +#define IEEE802154_FC_TYPE_DATA 0x1 /* Frame is data */ +#define IEEE802154_FC_TYPE_ACK 0x2 /* Frame is acknowledgment */ +#define IEEE802154_FC_TYPE_MAC_CMD 0x3 /* Frame is MAC command */ + +#define IEEE802154_FC_TYPE_SHIFT 0 +#define IEEE802154_FC_TYPE_MASK ((1 << 3) - 1) +#define IEEE802154_FC_TYPE(x) ((x & IEEE802154_FC_TYPE_MASK) >> IEEE802154_FC_TYPE_SHIFT) +#define IEEE802154_FC_SET_TYPE(v, x) do {v = (((v) & ~IEEE802154_FC_TYPE_MASK) | \ + (((x) << IEEE802154_FC_TYPE_SHIFT) \ + & IEEE802154_FC_TYPE_MASK)); } while (0) + +#define IEEE802154_FC_SECEN (1 << 3) +#define IEEE802154_FC_FRPEND (1 << 4) +#define IEEE802154_FC_ACK_REQ (1 << 5) +#define IEEE802154_FC_INTRA_PAN (1 << 6) + +#define IEEE802154_FC_SAMODE_SHIFT 14 +#define IEEE802154_FC_SAMODE_MASK (3 << IEEE802154_FC_SAMODE_SHIFT) +#define IEEE802154_FC_DAMODE_SHIFT 10 +#define IEEE802154_FC_DAMODE_MASK (3 << IEEE802154_FC_DAMODE_SHIFT) + +#define IEEE802154_FC_SAMODE(x) \ + (((x) & IEEE802154_FC_SAMODE_MASK) >> IEEE802154_FC_SAMODE_SHIFT) + +#define IEEE802154_FC_DAMODE(x) \ + (((x) & IEEE802154_FC_DAMODE_MASK) >> IEEE802154_FC_DAMODE_SHIFT) + + +/* MAC's Command Frames Identifiers */ +#define IEEE802154_CMD_ASSOCIATION_REQ 0x01 +#define IEEE802154_CMD_ASSOCIATION_RESP 0x02 +#define IEEE802154_CMD_DISASSOCIATION_NOTIFY 0x03 +#define IEEE802154_CMD_DATA_REQ 0x04 +#define IEEE802154_CMD_PANID_CONFLICT_NOTIFY 0x05 +#define IEEE802154_CMD_ORPHAN_NOTIFY 0x06 +#define IEEE802154_CMD_BEACON_REQ 0x07 +#define IEEE802154_CMD_COORD_REALIGN_NOTIFY 0x08 +#define IEEE802154_CMD_GTS_REQ 0x09 + +/* + * The return values of MAC operations + */ +enum { + /* + * The requested operation was completed successfully. For a transmission + * request, this value indicates a successful transmission. + */ + IEEE802154_SUCCESS = 0x0, + + /* The beacon was lost following a synchronization request. */ + IEEE802154_BEACON_LOSS = 0xe0, + /* + * A transmission could not take place due to activity on the + * channel, i.e., the CSMA-CA mechanism has failed. + */ + IEEE802154_CHNL_ACCESS_FAIL = 0xe1, + /* The GTS request has been denied by the PAN coordinator. */ + IEEE802154_DENINED = 0xe2, + /* The attempt to disable the transceiver has failed. */ + IEEE802154_DISABLE_TRX_FAIL = 0xe3, + /* + * The received frame induces a failed security check according to + * the security suite. + */ + IEEE802154_FAILED_SECURITY_CHECK = 0xe4, + /* + * The frame resulting from secure processing has a length that is + * greater than aMACMaxFrameSize. + */ + IEEE802154_FRAME_TOO_LONG = 0xe5, + /* + * The requested GTS transmission failed because the specified GTS + * either did not have a transmit GTS direction or was not defined. + */ + IEEE802154_INVALID_GTS = 0xe6, + /* + * A request to purge an MSDU from the transaction queue was made using + * an MSDU handle that was not found in the transaction table. + */ + IEEE802154_INVALID_HANDLE = 0xe7, + /* A parameter in the primitive is out of the valid range.*/ + IEEE802154_INVALID_PARAMETER = 0xe8, + /* No acknowledgment was received after aMaxFrameRetries. */ + IEEE802154_NO_ACK = 0xe9, + /* A scan operation failed to find any network beacons.*/ + IEEE802154_NO_BEACON = 0xea, + /* No response data were available following a request. */ + IEEE802154_NO_DATA = 0xeb, + /* The operation failed because a short address was not allocated. */ + IEEE802154_NO_SHORT_ADDRESS = 0xec, + /* + * A receiver enable request was unsuccessful because it could not be + * completed within the CAP. + */ + IEEE802154_OUT_OF_CAP = 0xed, + /* + * A PAN identifier conflict has been detected and communicated to the + * PAN coordinator. + */ + IEEE802154_PANID_CONFLICT = 0xee, + /* A coordinator realignment command has been received. */ + IEEE802154_REALIGMENT = 0xef, + /* The transaction has expired and its information discarded. */ + IEEE802154_TRANSACTION_EXPIRED = 0xf0, + /* There is no capacity to store the transaction. */ + IEEE802154_TRANSACTION_OVERFLOW = 0xf1, + /* + * The transceiver was in the transmitter enabled state when the + * receiver was requested to be enabled. + */ + IEEE802154_TX_ACTIVE = 0xf2, + /* The appropriate key is not available in the ACL. */ + IEEE802154_UNAVAILABLE_KEY = 0xf3, + /* + * A SET/GET request was issued with the identifier of a PIB attribute + * that is not supported. + */ + IEEE802154_UNSUPPORTED_ATTR = 0xf4, + /* + * A request to perform a scan operation failed because the MLME was + * in the process of performing a previously initiated scan operation. + */ + IEEE802154_SCAN_IN_PROGRESS = 0xfc, +}; + + +#endif + + diff --git a/include/net/ieee802154/netdevice.h b/include/net/ieee802154/netdevice.h new file mode 100644 index 0000000..42b66fb --- /dev/null +++ b/include/net/ieee802154/netdevice.h @@ -0,0 +1,84 @@ +/* + * An interface between IEEE802.15.4 device and rest of the kernel. + * + * Copyright (C) 2007, 2008, 2009 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Pavel Smolenskiy <pavel.smolenskiy@gmail.com> + * Maxim Gorbachyov <maxim.gorbachev@siemens.com> + * Maxim Osipov <maxim.osipov@siemens.com> + * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> + */ + +#ifndef IEEE802154_NETDEVICE_H +#define IEEE802154_NETDEVICE_H + +/* + * A control block of skb passed between the ARPHRD_IEEE802154 device + * and other stack parts. + */ +struct ieee802154_mac_cb { + u8 lqi; + struct ieee802154_addr sa; + struct ieee802154_addr da; + u8 flags; + u8 seq; +}; +#define MAC_CB(skb) ((struct ieee802154_mac_cb *)(skb)->cb) + +#define MAC_CB_FLAG_TYPEMASK ((1 << 3) - 1) + +#define MAC_CB_FLAG_ACKREQ (1 << 3) +#define MAC_CB_FLAG_SECEN (1 << 4) +#define MAC_CB_FLAG_INTRAPAN (1 << 5) + +#define MAC_CB_IS_ACKREQ(skb) (MAC_CB(skb)->flags & MAC_CB_FLAG_ACKREQ) +#define MAC_CB_IS_SECEN(skb) (MAC_CB(skb)->flags & MAC_CB_FLAG_SECEN) +#define MAC_CB_IS_INTRAPAN(skb) (MAC_CB(skb)->flags & MAC_CB_FLAG_INTRAPAN) +#define MAC_CB_TYPE(skb) (MAC_CB(skb)->flags & MAC_CB_FLAG_TYPEMASK) + +#define IEEE802154_MAC_SCAN_ED 0 +#define IEEE802154_MAC_SCAN_ACTIVE 1 +#define IEEE802154_MAC_SCAN_PASSIVE 2 +#define IEEE802154_MAC_SCAN_ORPHAN 3 + +/* + * This should be located at net_device->ml_priv + */ +struct ieee802154_mlme_ops { + int (*assoc_req)(struct net_device *dev, struct ieee802154_addr *addr, u8 channel, u8 cap); + int (*assoc_resp)(struct net_device *dev, struct ieee802154_addr *addr, u16 short_addr, u8 status); + int (*disassoc_req)(struct net_device *dev, struct ieee802154_addr *addr, u8 reason); + int (*start_req)(struct net_device *dev, struct ieee802154_addr *addr, u8 channel, + u8 bcn_ord, u8 sf_ord, u8 pan_coord, u8 blx, + u8 coord_realign); + int (*scan_req)(struct net_device *dev, u8 type, u32 channels, u8 duration); + + /* + * FIXME: these should become the part of PIB/MIB interface. + * However we still don't have IB interface of any kind + */ + u16 (*get_pan_id)(struct net_device *dev); + u16 (*get_short_addr)(struct net_device *dev); + u8 (*get_dsn)(struct net_device *dev); + u8 (*get_bsn)(struct net_device *dev); +}; + +#define IEEE802154_MLME_OPS(dev) ((struct ieee802154_mlme_ops *) dev->ml_priv) + +#endif + + diff --git a/net/Kconfig b/net/Kconfig index c19f549..7051b97 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -179,6 +179,7 @@ source "net/lapb/Kconfig" source "net/econet/Kconfig" source "net/wanrouter/Kconfig" source "net/phonet/Kconfig" +source "net/ieee802154/Kconfig" source "net/sched/Kconfig" source "net/dcb/Kconfig" diff --git a/net/Makefile b/net/Makefile index 9e00a55..ba324ae 100644 --- a/net/Makefile +++ b/net/Makefile @@ -60,6 +60,7 @@ obj-$(CONFIG_NET_9P) += 9p/ ifneq ($(CONFIG_DCB),) obj-y += dcb/ endif +obj-y += ieee802154/ ifeq ($(CONFIG_NET),y) obj-$(CONFIG_SYSCTL) += sysctl_net.o diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig new file mode 100644 index 0000000..f540cd1 --- /dev/null +++ b/net/ieee802154/Kconfig @@ -0,0 +1,12 @@ +config IEEE802154 + tristate "IEEE Std 802.15.4 Low-Rate Wireless Personal Area Networks support (EXPERIMENTAL)" + depends on EXPERIMENTAL + ---help--- + IEEE Std 802.15.4 defines a low data rate, low power and low complexity + short range wireless personal area networks. It was designed to + organise networks of sensors, switches, etc automation devices. Maximum + allowed data rate is 250 kb/s and typical personal operating space + around 10m. + + Say Y here to compile LR-WPAN support into the kernel or say M to + compile it as modules. diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile new file mode 100644 index 0000000..cb88054 --- /dev/null +++ b/net/ieee802154/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_IEEE802154) += af_802154.o +af_802154-objs := af_ieee802154.o raw.o dgram.o + +EXTRA_CFLAGS += -Wall -DDEBUG diff --git a/net/ieee802154/af802154.h b/net/ieee802154/af802154.h new file mode 100644 index 0000000..3a96fb9 --- /dev/null +++ b/net/ieee802154/af802154.h @@ -0,0 +1,35 @@ +/* + * Internal interfaces for ieee 802.15.4 address family. + * + * Copyright 2007, 2008, 2009 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Sergey Lapin <sergey.lapin@siemens.com> + * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> + */ + +#ifndef AF802154_H +#define AF802154_H + +struct sk_buff; +struct net_devce; +extern struct proto ieee802154_raw_prot; +extern struct proto ieee802154_dgram_prot; +void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb); +int ieee802154_dgram_deliver(struct net_device *dev, struct sk_buff *skb); +struct net_device *ieee802154_get_dev(struct net *net, struct ieee802154_addr *addr); + +#endif diff --git a/net/ieee802154/af_ieee802154.c b/net/ieee802154/af_ieee802154.c new file mode 100644 index 0000000..9e8284d --- /dev/null +++ b/net/ieee802154/af_ieee802154.c @@ -0,0 +1,356 @@ +/* + * IEEE802154.4 socket interface + * + * Copyright 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Sergey Lapin <sergey.lapin@siemens.com> + * Maxim Gorbachyov <maxim.gorbachev@siemens.com> + */ + +#include <linux/net.h> +#include <linux/capability.h> +#include <linux/module.h> +#include <linux/if_arp.h> +#include <linux/if.h> +#include <linux/termios.h> /* For TIOCOUTQ/INQ */ +#include <linux/list.h> +#include <net/datalink.h> +#include <net/psnap.h> +#include <net/sock.h> +#include <net/tcp_states.h> +#include <net/route.h> + +#include <net/ieee802154/af_ieee802154.h> +#include <net/ieee802154/netdevice.h> + +#include "af802154.h" + +#define DBG_DUMP(data, len) { \ + int i; \ + pr_debug("file %s: function: %s: data: len %d:\n", __FILE__, __func__, len); \ + for (i = 0; i < len; i++) {\ + pr_debug("%02x: %02x\n", i, (data)[i]); \ + } \ +} + +/* + * Utility function for families + */ +struct net_device *ieee802154_get_dev(struct net *net, struct ieee802154_addr *addr) +{ + struct net_device *dev = NULL; + + switch (addr->addr_type) { + case IEEE802154_ADDR_LONG: + rtnl_lock(); + dev = dev_getbyhwaddr(net, ARPHRD_IEEE802154, addr->hwaddr); + if (dev) + dev_hold(dev); + rtnl_unlock(); + break; + case IEEE802154_ADDR_SHORT: + if (addr->pan_id != 0xffff && addr->short_addr != IEEE802154_ADDR_UNDEF && addr->short_addr != 0xffff) { + struct net_device *tmp; + + rtnl_lock(); + + for_each_netdev(net, tmp) { + if (tmp->type == ARPHRD_IEEE802154) { + if (IEEE802154_MLME_OPS(tmp)->get_pan_id(tmp) == addr->pan_id + && IEEE802154_MLME_OPS(tmp)->get_short_addr(tmp) == addr->short_addr) { + dev = tmp; + dev_hold(dev); + break; + } + } + } + + rtnl_unlock(); + } + break; + default: + pr_warning("Unsupported ieee802154 address type: %d\n", addr->addr_type); + break; + } + + return dev; +} + +static int ieee802154_sock_release(struct socket *sock) +{ + struct sock *sk = sock->sk; + + if (sk) { + sock->sk = NULL; + sk->sk_prot->close(sk, 0); + } + return 0; +} +static int ieee802154_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len) +{ + struct sock *sk = sock->sk; + + return sk->sk_prot->sendmsg(iocb, sk, msg, len); +} + +static int ieee802154_sock_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) +{ + struct sock *sk = sock->sk; + + if (sk->sk_prot->bind) + return sk->sk_prot->bind(sk, uaddr, addr_len); + + return sock_no_bind(sock, uaddr, addr_len); +} + +static int ieee802154_sock_connect(struct socket *sock, struct sockaddr *uaddr, + int addr_len, int flags) +{ + struct sock *sk = sock->sk; + + if (uaddr->sa_family == AF_UNSPEC) + return sk->sk_prot->disconnect(sk, flags); + + return sk->sk_prot->connect(sk, uaddr, addr_len); +} + +static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg, unsigned int cmd) +{ + struct ifreq ifr; + int ret = -EINVAL; + struct net_device *dev; + + if (copy_from_user(&ifr, arg, sizeof(struct ifreq))) + return -EFAULT; + + ifr.ifr_name[IFNAMSIZ-1] = 0; + + dev_load(sock_net(sk), ifr.ifr_name); + dev = dev_get_by_name(sock_net(sk), ifr.ifr_name); + if (dev->type == ARPHRD_IEEE802154 || dev->type == ARPHRD_IEEE802154_PHY) + ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, cmd); + + if (!ret && copy_to_user(arg, &ifr, sizeof(struct ifreq))) + ret = -EFAULT; + dev_put(dev); + + return ret; +} + +static int ieee802154_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) +{ + struct sock *sk = sock->sk; + + switch (cmd) { + case SIOCGSTAMP: + return sock_get_timestamp(sk, (struct timeval __user *)arg); + case SIOCGSTAMPNS: + return sock_get_timestampns(sk, (struct timespec __user *)arg); + case SIOCGIFADDR: + case SIOCSIFADDR: + return ieee802154_dev_ioctl(sk, (struct ifreq __user *)arg, cmd); + default: + if (!sk->sk_prot->ioctl) + return -ENOIOCTLCMD; + return sk->sk_prot->ioctl(sk, cmd, arg); + } +} + +static const struct proto_ops ieee802154_raw_ops = { + .family = PF_IEEE802154, + .owner = THIS_MODULE, + .release = ieee802154_sock_release, + .bind = ieee802154_sock_bind, + .connect = ieee802154_sock_connect, + .socketpair = sock_no_socketpair, + .accept = sock_no_accept, + .getname = sock_no_getname, + .poll = datagram_poll, + .ioctl = ieee802154_sock_ioctl, + .listen = sock_no_listen, + .shutdown = sock_no_shutdown, + .setsockopt = sock_common_setsockopt, + .getsockopt = sock_common_getsockopt, + .sendmsg = ieee802154_sock_sendmsg, + .recvmsg = sock_common_recvmsg, + .mmap = sock_no_mmap, + .sendpage = sock_no_sendpage, +#ifdef CONFIG_COMPAT + .compat_setsockopt = compat_sock_common_setsockopt, + .compat_getsockopt = compat_sock_common_getsockopt, +#endif +}; + +static const struct proto_ops ieee802154_dgram_ops = { + .family = PF_IEEE802154, + .owner = THIS_MODULE, + .release = ieee802154_sock_release, + .bind = ieee802154_sock_bind, + .connect = ieee802154_sock_connect, + .socketpair = sock_no_socketpair, + .accept = sock_no_accept, + .getname = sock_no_getname, + .poll = datagram_poll, + .ioctl = ieee802154_sock_ioctl, + .listen = sock_no_listen, + .shutdown = sock_no_shutdown, + .setsockopt = sock_common_setsockopt, + .getsockopt = sock_common_getsockopt, + .sendmsg = ieee802154_sock_sendmsg, + .recvmsg = sock_common_recvmsg, + .mmap = sock_no_mmap, + .sendpage = sock_no_sendpage, +#ifdef CONFIG_COMPAT + .compat_setsockopt = compat_sock_common_setsockopt, + .compat_getsockopt = compat_sock_common_getsockopt, +#endif +}; + + +/* + * Create a socket. Initialise the socket, blank the addresses + * set the state. + */ +static int ieee802154_create(struct net *net, struct socket *sock, int protocol) +{ + struct sock *sk; + int rc; + struct proto *proto; + const struct proto_ops *ops; + + /* FIXME: init_net */ + if (net != &init_net) + return -EAFNOSUPPORT; + + switch (sock->type) { + case SOCK_RAW: + proto = &ieee802154_raw_prot; + ops = &ieee802154_raw_ops; + break; + case SOCK_DGRAM: + proto = &ieee802154_dgram_prot; + ops = &ieee802154_dgram_ops; + break; + default: + rc = -ESOCKTNOSUPPORT; + goto out; + } + + rc = -ENOMEM; + sk = sk_alloc(net, PF_IEEE802154, GFP_KERNEL, proto); + if (!sk) + goto out; + rc = 0; + + sock->ops = ops; + + sock_init_data(sock, sk); + /* FIXME: sk->sk_destruct */ + sk->sk_family = PF_IEEE802154; + + /* Checksums on by default */ + sock_set_flag(sk, SOCK_ZAPPED); + + if (sk->sk_prot->hash) + sk->sk_prot->hash(sk); + + if (sk->sk_prot->init) { + rc = sk->sk_prot->init(sk); + if (rc) + sk_common_release(sk); + } +out: + return rc; +} + +static struct net_proto_family ieee802154_family_ops = { + .family = PF_IEEE802154, + .create = ieee802154_create, + .owner = THIS_MODULE, +}; + +static int ieee802154_rcv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *pt, struct net_device *orig_dev) +{ + DBG_DUMP(skb->data, skb->len); + if (!netif_running(dev)) + return -ENODEV; + pr_debug("got frame, type %d, dev %p\n", dev->type, dev); + /* FIXME: init_net */ + if (!net_eq(dev_net(dev), &init_net)) + goto drop; + + ieee802154_raw_deliver(dev, skb); + + if (dev->type != ARPHRD_IEEE802154) + goto drop; + + if (skb->pkt_type != PACKET_OTHERHOST) + return ieee802154_dgram_deliver(dev, skb); + +drop: + kfree_skb(skb); + return NET_RX_DROP; +} + + +static struct packet_type ieee802154_packet_type = { + .type = __constant_htons(ETH_P_IEEE802154), + .func = ieee802154_rcv, +}; + +static int __init af_ieee802154_init(void) +{ + int rc = -EINVAL; + + rc = proto_register(&ieee802154_raw_prot, 1); + if (rc) + goto out; + + rc = proto_register(&ieee802154_dgram_prot, 1); + if (rc) + goto err_dgram; + + /* Tell SOCKET that we are alive */ + rc = sock_register(&ieee802154_family_ops); + if (rc) + goto err_sock; + dev_add_pack(&ieee802154_packet_type); + + rc = 0; + goto out; + +err_sock: + proto_unregister(&ieee802154_dgram_prot); +err_dgram: + proto_unregister(&ieee802154_raw_prot); +out: + return rc; +} +static void af_ieee802154_remove(void) +{ + dev_remove_pack(&ieee802154_packet_type); + sock_unregister(PF_IEEE802154); + proto_unregister(&ieee802154_dgram_prot); + proto_unregister(&ieee802154_raw_prot); +} + +module_init(af_ieee802154_init); +module_exit(af_ieee802154_remove); + +MODULE_LICENSE("GPL"); +MODULE_ALIAS_NETPROTO(PF_IEEE802154); diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c new file mode 100644 index 0000000..761709e --- /dev/null +++ b/net/ieee802154/dgram.c @@ -0,0 +1,373 @@ +/* + * ZigBee socket interface + * + * Copyright 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Sergey Lapin <sergey.lapin@siemens.com> + * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> + */ + +#include <linux/net.h> +#include <linux/module.h> +#include <linux/if_arp.h> +#include <linux/list.h> +#include <net/sock.h> +#include <net/ieee802154/af_ieee802154.h> +#include <net/ieee802154/mac_def.h> +#include <net/ieee802154/netdevice.h> + +#include <asm/ioctls.h> + +#include "af802154.h" + +static HLIST_HEAD(dgram_head); +static DEFINE_RWLOCK(dgram_lock); + +struct dgram_sock { + struct sock sk; + + int bound; + struct ieee802154_addr src_addr; + struct ieee802154_addr dst_addr; +}; + +static inline struct dgram_sock *dgram_sk(const struct sock *sk) +{ + return (struct dgram_sock *)sk; +} + + +static void dgram_hash(struct sock *sk) +{ + write_lock_bh(&dgram_lock); + sk_add_node(sk, &dgram_head); + sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); + write_unlock_bh(&dgram_lock); +} + +static void dgram_unhash(struct sock *sk) +{ + write_lock_bh(&dgram_lock); + if (sk_del_node_init(sk)) + sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); + write_unlock_bh(&dgram_lock); +} + +static int dgram_init(struct sock *sk) +{ + struct dgram_sock *ro = dgram_sk(sk); + + ro->dst_addr.addr_type = IEEE802154_ADDR_LONG; + ro->dst_addr.pan_id = 0xffff; + memset(&ro->dst_addr.hwaddr, 0xff, sizeof(ro->dst_addr.hwaddr)); + return 0; +} + +static void dgram_close(struct sock *sk, long timeout) +{ + sk_common_release(sk); +} + +static int dgram_bind(struct sock *sk, struct sockaddr *uaddr, int len) +{ + struct sockaddr_ieee802154 *addr = (struct sockaddr_ieee802154 *)uaddr; + struct dgram_sock *ro = dgram_sk(sk); + int err = 0; + struct net_device *dev; + + ro->bound = 0; + + if (len < sizeof(*addr)) + return -EINVAL; + + if (addr->family != AF_IEEE802154) + return -EINVAL; + + lock_sock(sk); + + dev = ieee802154_get_dev(sock_net(sk), &addr->addr); + if (!dev) { + err = -ENODEV; + goto out; + } + + if (dev->type != ARPHRD_IEEE802154) { + err = -ENODEV; + goto out_put; + } + + memcpy(&ro->src_addr, &addr->addr, sizeof(struct ieee802154_addr)); + + ro->bound = 1; +out_put: + dev_put(dev); +out: + release_sock(sk); + + return err; +} + +static int dgram_ioctl(struct sock *sk, int cmd, unsigned long arg) +{ + switch (cmd) { + case SIOCOUTQ: + { + int amount = atomic_read(&sk->sk_wmem_alloc); + return put_user(amount, (int __user *)arg); + } + + case SIOCINQ: + { + struct sk_buff *skb; + unsigned long amount; + + amount = 0; + spin_lock_bh(&sk->sk_receive_queue.lock); + skb = skb_peek(&sk->sk_receive_queue); + if (skb != NULL) { + /* + * We will only return the amount + * of this packet since that is all + * that will be read. + */ + /* FIXME: parse the header for more correct value */ + amount = skb->len - (3+8+8); + } + spin_unlock_bh(&sk->sk_receive_queue.lock); + return put_user(amount, (int __user *)arg); + } + + } + return -ENOIOCTLCMD; +} + +/* FIXME: autobind */ +static int dgram_connect(struct sock *sk, struct sockaddr *uaddr, + int len) +{ + struct sockaddr_ieee802154 *addr = (struct sockaddr_ieee802154 *)uaddr; + struct dgram_sock *ro = dgram_sk(sk); + int err = 0; + + if (len < sizeof(*addr)) + return -EINVAL; + + if (addr->family != AF_IEEE802154) + return -EINVAL; + + lock_sock(sk); + + if (!ro->bound) { + err = -ENETUNREACH; + goto out; + } + + memcpy(&ro->dst_addr, &addr->addr, sizeof(struct ieee802154_addr)); + +out: + release_sock(sk); + return err; +} + +static int dgram_disconnect(struct sock *sk, int flags) +{ + struct dgram_sock *ro = dgram_sk(sk); + + lock_sock(sk); + + ro->dst_addr.addr_type = IEEE802154_ADDR_LONG; + memset(&ro->dst_addr.hwaddr, 0xff, sizeof(ro->dst_addr.hwaddr)); + + release_sock(sk); + + return 0; +} + +static int dgram_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, + size_t size) +{ + struct net_device *dev; + unsigned mtu; + struct sk_buff *skb; + struct dgram_sock *ro = dgram_sk(sk); + int err; + + if (msg->msg_flags & MSG_OOB) { + pr_debug("msg->msg_flags = 0x%x\n", msg->msg_flags); + return -EOPNOTSUPP; + } + + if (!ro->bound) + dev = dev_getfirstbyhwtype(sock_net(sk), ARPHRD_IEEE802154); + else + dev = ieee802154_get_dev(sock_net(sk), &ro->src_addr); + + if (!dev) { + pr_debug("no dev\n"); + return -ENXIO; + } + mtu = dev->mtu; + pr_debug("name = %s, mtu = %u\n", dev->name, mtu); + + skb = sock_alloc_send_skb(sk, LL_ALLOCATED_SPACE(dev) + size, msg->msg_flags & MSG_DONTWAIT, + &err); + if (!skb) { + dev_put(dev); + return err; + } + skb_reserve(skb, LL_RESERVED_SPACE(dev)); + + skb_reset_network_header(skb); + + MAC_CB(skb)->flags = IEEE802154_FC_TYPE_DATA | MAC_CB_FLAG_ACKREQ; + MAC_CB(skb)->seq = IEEE802154_MLME_OPS(dev)->get_dsn(dev); + err = dev_hard_header(skb, dev, ETH_P_IEEE802154, &ro->dst_addr, ro->bound ? &ro->src_addr : NULL, size); + if (err < 0) { + kfree_skb(skb); + dev_put(dev); + return err; + } + + skb_reset_mac_header(skb); + + err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size); + if (err < 0) { + kfree_skb(skb); + dev_put(dev); + return err; + } + + if (size > mtu) { + pr_debug("size = %u, mtu = %u\n", size, mtu); + return -EINVAL; + } + + skb->dev = dev; + skb->sk = sk; + skb->protocol = htons(ETH_P_IEEE802154); + + err = dev_queue_xmit(skb); + + dev_put(dev); + + if (err) + return err; + + return size; +} + +static int dgram_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, + size_t len, int noblock, int flags, int *addr_len) +{ + size_t copied = 0; + int err = -EOPNOTSUPP; + struct sk_buff *skb; + + skb = skb_recv_datagram(sk, flags, noblock, &err); + if (!skb) + goto out; + + copied = skb->len; + if (len < copied) { + msg->msg_flags |= MSG_TRUNC; + copied = len; + } + + /* FIXME: skip headers if necessary ?! */ + err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); + if (err) + goto done; + + sock_recv_timestamp(msg, sk, skb); + + if (flags & MSG_TRUNC) + copied = skb->len; +done: + skb_free_datagram(sk, skb); +out: + if (err) + return err; + return copied; +} + +static int dgram_rcv_skb(struct sock *sk, struct sk_buff *skb) +{ + if (sock_queue_rcv_skb(sk, skb) < 0) { + atomic_inc(&sk->sk_drops); + kfree_skb(skb); + return NET_RX_DROP; + } + + return NET_RX_SUCCESS; +} + +int ieee802154_dgram_deliver(struct net_device *dev, struct sk_buff *skb) +{ + struct sock *sk, *prev = NULL; + struct hlist_node *node; + int ret = NET_RX_SUCCESS; + + /* Data frame processing */ + BUG_ON(dev->type != ARPHRD_IEEE802154); + + read_lock(&dgram_lock); + sk_for_each(sk, node, &dgram_head) { + struct dgram_sock *ro = dgram_sk(sk); + if (!ro->bound || + (ro->src_addr.addr_type == IEEE802154_ADDR_LONG && + !memcmp(ro->src_addr.hwaddr, dev->dev_addr, IEEE802154_ADDR_LEN)) || + (ro->src_addr.addr_type == IEEE802154_ADDR_SHORT && + IEEE802154_MLME_OPS(dev)->get_pan_id(dev) == ro->src_addr.pan_id && + IEEE802154_MLME_OPS(dev)->get_short_addr(dev) == ro->src_addr.short_addr)) { + if (prev) { + struct sk_buff *clone; + clone = skb_clone(skb, GFP_ATOMIC); + if (clone) + dgram_rcv_skb(prev, clone); + } + + prev = sk; + } + } + + if (prev) + dgram_rcv_skb(prev, skb); + else { + kfree_skb(skb); + ret = NET_RX_DROP; + } + read_unlock(&dgram_lock); + + return ret; +} + +struct proto ieee802154_dgram_prot = { + .name = "IEEE-802.15.4-MAC", + .owner = THIS_MODULE, + .obj_size = sizeof(struct dgram_sock), + .init = dgram_init, + .close = dgram_close, + .bind = dgram_bind, + .sendmsg = dgram_sendmsg, + .recvmsg = dgram_recvmsg, + .hash = dgram_hash, + .unhash = dgram_unhash, + .connect = dgram_connect, + .disconnect = dgram_disconnect, + .ioctl = dgram_ioctl, +}; + diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c new file mode 100644 index 0000000..678f196 --- /dev/null +++ b/net/ieee802154/raw.c @@ -0,0 +1,250 @@ +/* + * Raw IEEE 802.15.4 sockets + * + * Copyright 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Sergey Lapin <sergey.lapin@siemens.com> + * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> + */ + +#include <linux/net.h> +#include <linux/module.h> +#include <linux/if_arp.h> +#include <linux/list.h> +#include <net/sock.h> +#include <net/ieee802154/af_ieee802154.h> + +#include "af802154.h" + +static HLIST_HEAD(raw_head); +static DEFINE_RWLOCK(raw_lock); + +static void raw_hash(struct sock *sk) +{ + write_lock_bh(&raw_lock); + sk_add_node(sk, &raw_head); + sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); + write_unlock_bh(&raw_lock); +} + +static void raw_unhash(struct sock *sk) +{ + write_lock_bh(&raw_lock); + if (sk_del_node_init(sk)) + sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); + write_unlock_bh(&raw_lock); +} + +static void raw_close(struct sock *sk, long timeout) +{ + sk_common_release(sk); +} + +static int raw_bind(struct sock *sk, struct sockaddr *uaddr, int len) +{ + struct sockaddr_ieee802154 *addr = (struct sockaddr_ieee802154 *)uaddr; + int err = 0; + struct net_device *dev = NULL; + + if (len < sizeof(*addr)) + return -EINVAL; + + if (addr->family != AF_IEEE802154) + return -EINVAL; + + lock_sock(sk); + + dev = ieee802154_get_dev(sock_net(sk), &addr->addr); + if (!dev) { + err = -ENODEV; + goto out; + } + + if (dev->type != ARPHRD_IEEE802154_PHY && dev->type != ARPHRD_IEEE802154) { + err = -ENODEV; + goto out_put; + } + + sk->sk_bound_dev_if = dev->ifindex; + sk_dst_reset(sk); + +out_put: + dev_put(dev); +out: + release_sock(sk); + + return err; +} + +static int raw_connect(struct sock *sk, struct sockaddr *uaddr, + int addr_len) +{ + return -ENOTSUPP; +} + +static int raw_disconnect(struct sock *sk, int flags) +{ + return 0; +} + +static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, + size_t size) +{ + struct net_device *dev; + unsigned mtu; + struct sk_buff *skb; + int err; + + if (msg->msg_flags & MSG_OOB) { + pr_debug("msg->msg_flags = 0x%x\n", msg->msg_flags); + return -EOPNOTSUPP; + } + + lock_sock(sk); + if (!sk->sk_bound_dev_if) + dev = dev_getfirstbyhwtype(sock_net(sk), ARPHRD_IEEE802154_PHY); + else + dev = dev_get_by_index(sock_net(sk), sk->sk_bound_dev_if); + release_sock(sk); + + if (!dev) { + pr_debug("no dev\n"); + err = -ENXIO; + goto out; + } + + mtu = dev->mtu; + pr_debug("name = %s, mtu = %u\n", dev->name, mtu); + + if (size > mtu) { + pr_debug("size = %u, mtu = %u\n", size, mtu); + err = -EINVAL; + goto out_dev; + } + + skb = sock_alloc_send_skb(sk, LL_ALLOCATED_SPACE(dev) + size, msg->msg_flags & MSG_DONTWAIT, + &err); + if (!skb) + goto out_dev; + + skb_reserve(skb, LL_RESERVED_SPACE(dev)); + + skb_reset_mac_header(skb); + skb_reset_network_header(skb); + + err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size); + if (err < 0) + goto out_skb; + + skb->dev = dev; + skb->sk = sk; + skb->protocol = htons(ETH_P_IEEE802154); + + err = dev_queue_xmit(skb); + + dev_put(dev); + + return size; + +out_skb: + kfree_skb(skb); +out_dev: + dev_put(dev); +out: + return err; +} + +static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, + size_t len, int noblock, int flags, int *addr_len) +{ + size_t copied = 0; + int err = -EOPNOTSUPP; + struct sk_buff *skb; + + skb = skb_recv_datagram(sk, flags, noblock, &err); + if (!skb) + goto out; + + copied = skb->len; + if (len < copied) { + msg->msg_flags |= MSG_TRUNC; + copied = len; + } + + err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); + if (err) + goto done; + + sock_recv_timestamp(msg, sk, skb); + + if (flags & MSG_TRUNC) + copied = skb->len; +done: + skb_free_datagram(sk, skb); +out: + if (err) + return err; + return copied; +} + +static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb) +{ + if (sock_queue_rcv_skb(sk, skb) < 0) { + atomic_inc(&sk->sk_drops); + kfree_skb(skb); + return NET_RX_DROP; + } + + return NET_RX_SUCCESS; +} + + +void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb) +{ + struct sock *sk; + struct hlist_node *node; + + read_lock(&raw_lock); + sk_for_each(sk, node, &raw_head) { + bh_lock_sock(sk); + if (!sk->sk_bound_dev_if || sk->sk_bound_dev_if == dev->ifindex) { + + struct sk_buff *clone; + + clone = skb_clone(skb, GFP_ATOMIC); + if (clone) + raw_rcv_skb(sk, clone); + } + bh_unlock_sock(sk); + } + read_unlock(&raw_lock); +} + +struct proto ieee802154_raw_prot = { + .name = "IEEE-802.15.4-RAW", + .owner = THIS_MODULE, + .obj_size = sizeof(struct sock), + .close = raw_close, + .bind = raw_bind, + .sendmsg = raw_sendmsg, + .recvmsg = raw_recvmsg, + .hash = raw_hash, + .unhash = raw_unhash, + .connect = raw_connect, + .disconnect = raw_disconnect, +}; + -- 1.6.3.1 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-03 9:33 ` [PATCH 3/6] net: add IEEE 802.15.4 socket family implementation Dmitry Eremin-Solenikov @ 2009-06-03 9:33 ` Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 5/6] ieee802154: add documentation about our stack Dmitry Eremin-Solenikov 2009-06-03 9:39 ` [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices Johannes Berg 0 siblings, 2 replies; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 9:33 UTC (permalink / raw) To: linux-kernel Cc: netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Dmitry Eremin-Solenikov Add a netlink interface for configuration of IEEE 802.15.4 device. Also this interface specifies events notification sent by devices towards higher layers. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Sergey Lapin <slapin@ossfans.org> --- include/net/ieee802154/nl802154.h | 165 +++++++++++++ net/ieee802154/Makefile | 3 +- net/ieee802154/netlink.c | 485 +++++++++++++++++++++++++++++++++++++ 3 files changed, 652 insertions(+), 1 deletions(-) create mode 100644 include/net/ieee802154/nl802154.h create mode 100644 net/ieee802154/netlink.c diff --git a/include/net/ieee802154/nl802154.h b/include/net/ieee802154/nl802154.h new file mode 100644 index 0000000..27f6ee9 --- /dev/null +++ b/include/net/ieee802154/nl802154.h @@ -0,0 +1,165 @@ +/* + * ieee802154_nl.h + * + * Copyright (C) 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#ifndef IEEE802154_NL_H +#define IEEE802154_NL_H + +#define IEEE802154_NL_NAME "802.15.4 MAC" +#define IEEE802154_MCAST_COORD_NAME "coordinator" +#define IEEE802154_MCAST_BEACON_NAME "beacon" + +enum { + __IEEE802154_ATTR_INVALID, + + IEEE802154_ATTR_DEV_NAME, + IEEE802154_ATTR_DEV_INDEX, + + IEEE802154_ATTR_STATUS, + + IEEE802154_ATTR_SHORT_ADDR, + IEEE802154_ATTR_HW_ADDR, + IEEE802154_ATTR_PAN_ID, + + IEEE802154_ATTR_CHANNEL, + + IEEE802154_ATTR_COORD_SHORT_ADDR, + IEEE802154_ATTR_COORD_HW_ADDR, + IEEE802154_ATTR_COORD_PAN_ID, + + IEEE802154_ATTR_SRC_SHORT_ADDR, + IEEE802154_ATTR_SRC_HW_ADDR, + IEEE802154_ATTR_SRC_PAN_ID, + + IEEE802154_ATTR_DEST_SHORT_ADDR, + IEEE802154_ATTR_DEST_HW_ADDR, + IEEE802154_ATTR_DEST_PAN_ID, + + IEEE802154_ATTR_CAPABILITY, /* FIXME: this is association */ + IEEE802154_ATTR_REASON, + IEEE802154_ATTR_SCAN_TYPE, + IEEE802154_ATTR_CHANNELS, + IEEE802154_ATTR_DURATION, + IEEE802154_ATTR_ED_LIST, + IEEE802154_ATTR_BCN_ORD, + IEEE802154_ATTR_SF_ORD, + IEEE802154_ATTR_PAN_COORD, + IEEE802154_ATTR_BAT_EXT, + IEEE802154_ATTR_COORD_REALIGN, + IEEE802154_ATTR_SEC, + + __IEEE802154_ATTR_MAX, +}; + +#define IEEE802154_ATTR_MAX (__IEEE802154_ATTR_MAX - 1) +#define NLA_HW_ADDR NLA_U64 +#define NLA_GET_HW_ADDR(attr, addr) do { u64 _temp = nla_get_u64(attr); memcpy(addr, &_temp, 8); } while (0) +#define NLA_PUT_HW_ADDR(msg, attr, addr) do { u64 _temp; memcpy(&_temp, addr, 8); NLA_PUT_U64(msg, attr, _temp); } while (0) + +#ifdef IEEE802154_NL_WANT_POLICY +static struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = { + [IEEE802154_ATTR_DEV_NAME] = { .type = NLA_STRING, }, + [IEEE802154_ATTR_DEV_INDEX] = { .type = NLA_U32, }, + + [IEEE802154_ATTR_STATUS] = { .type = NLA_U8, }, + [IEEE802154_ATTR_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_PAN_ID] = { .type = NLA_U16, }, + [IEEE802154_ATTR_CHANNEL] = { .type = NLA_U8, }, + [IEEE802154_ATTR_COORD_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_COORD_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_COORD_PAN_ID] = { .type = NLA_U16, }, + [IEEE802154_ATTR_SRC_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_SRC_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_SRC_PAN_ID] = { .type = NLA_U16, }, + [IEEE802154_ATTR_DEST_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_DEST_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_DEST_PAN_ID] = { .type = NLA_U16, }, + + [IEEE802154_ATTR_CAPABILITY] = { .type = NLA_U8, }, + [IEEE802154_ATTR_REASON] = { .type = NLA_U8, }, + [IEEE802154_ATTR_SCAN_TYPE] = { .type = NLA_U8, }, + [IEEE802154_ATTR_CHANNELS] = { .type = NLA_U32, }, + [IEEE802154_ATTR_DURATION] = { .type = NLA_U8, }, +#ifdef __KERNEL__ + [IEEE802154_ATTR_ED_LIST] = { .len = 27 }, +#else + [IEEE802154_ATTR_ED_LIST] = { .minlen = 27, .maxlen = 27 }, +#endif +}; +#endif + +/* commands */ +/* REQ should be responded with CONF + * and INDIC with RESP + */ +enum { + __IEEE802154_COMMAND_INVALID, + + IEEE802154_ASSOCIATE_REQ, + IEEE802154_ASSOCIATE_CONF, + IEEE802154_DISASSOCIATE_REQ, + IEEE802154_DISASSOCIATE_CONF, + IEEE802154_GET_REQ, + IEEE802154_GET_CONF, +/* IEEE802154_GTS_REQ, */ +/* IEEE802154_GTS_CONF, */ + IEEE802154_RESET_REQ, + IEEE802154_RESET_CONF, +/* IEEE802154_RX_ENABLE_REQ, */ +/* IEEE802154_RX_ENABLE_CONF, */ + IEEE802154_SCAN_REQ, + IEEE802154_SCAN_CONF, + IEEE802154_SET_REQ, + IEEE802154_SET_CONF, + IEEE802154_START_REQ, + IEEE802154_START_CONF, + IEEE802154_SYNC_REQ, + IEEE802154_POLL_REQ, + IEEE802154_POLL_CONF, + + IEEE802154_ASSOCIATE_INDIC, + IEEE802154_ASSOCIATE_RESP, + IEEE802154_DISASSOCIATE_INDIC, + IEEE802154_BEACON_NOTIFY_INDIC, +/* IEEE802154_GTS_INDIC, */ + IEEE802154_ORPHAN_INDIC, + IEEE802154_ORPHAN_RESP, + IEEE802154_COMM_STATUS_INDIC, + IEEE802154_SYNC_LOSS_INDIC, + + __IEEE802154_CMD_MAX, +}; + +#define IEEE802154_CMD_MAX (__IEEE802154_CMD_MAX - 1) + + +#ifdef __KERNEL__ +struct net_device; + +int ieee802154_nl_assoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 cap); +int ieee802154_nl_assoc_confirm(struct net_device *dev, u16 short_addr, u8 status); +int ieee802154_nl_disassoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 reason); +int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status); +int ieee802154_nl_scan_confirm(struct net_device *dev, u8 status, u8 scan_type, u32 unscanned, + u8 *edl/*, struct list_head *pan_desc_list */); +int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid, u16 coord_addr); /* TODO */ +#endif + +#endif diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile index cb88054..7c0b025 100644 --- a/net/ieee802154/Makefile +++ b/net/ieee802154/Makefile @@ -1,4 +1,5 @@ -obj-$(CONFIG_IEEE802154) += af_802154.o +obj-$(CONFIG_IEEE802154) += nl802154.o af_802154.o +nl802154-objs := netlink.o af_802154-objs := af_ieee802154.o raw.o dgram.o EXTRA_CFLAGS += -Wall -DDEBUG diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c new file mode 100644 index 0000000..eafdc4d --- /dev/null +++ b/net/ieee802154/netlink.c @@ -0,0 +1,485 @@ +/* + * Netlink inteface for IEEE 802.15.4 stack + * + * Copyright 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Sergey Lapin <sergey.lapin@siemens.com> + * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> + */ + +#include <linux/kernel.h> +#include <linux/if_arp.h> +#include <net/netlink.h> +#include <net/genetlink.h> +#include <linux/netdevice.h> +#include <net/ieee802154/af_ieee802154.h> +#define IEEE802154_NL_WANT_POLICY +#include <net/ieee802154/nl802154.h> +#include <net/ieee802154/netdevice.h> + +static unsigned int ieee802154_seq_num; + +static struct genl_family ieee802154_coordinator_family = { + .id = GENL_ID_GENERATE, + .hdrsize = 0, + .name = IEEE802154_NL_NAME, + .version = 1, + .maxattr = IEEE802154_ATTR_MAX, +}; + +static struct genl_multicast_group ieee802154_coord_mcgrp = { + .name = IEEE802154_MCAST_COORD_NAME, +}; + +static struct genl_multicast_group ieee802154_beacon_mcgrp = { + .name = IEEE802154_MCAST_BEACON_NAME, +}; + +/* Requests to userspace */ +static struct sk_buff *ieee802154_nl_create(int flags, u8 req) +{ + void *hdr; + struct sk_buff *msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC); + + if (!msg) + return NULL; + + hdr = genlmsg_put(msg, 0, ieee802154_seq_num++, &ieee802154_coordinator_family, flags, req); + if (!hdr) { + nlmsg_free(msg); + return NULL; + } + + return msg; +} + +static int ieee802154_nl_finish(struct sk_buff *msg) +{ + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ + + if (!genlmsg_end(msg, hdr)) + goto out; + + return genlmsg_multicast(msg, 0, ieee802154_coord_mcgrp.id, GFP_ATOMIC); +out: + nlmsg_free(msg); + return -ENOBUFS; +} + +static int ieee802154_nl_put_failure(struct sk_buff *msg) +{ + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ + genlmsg_cancel(msg, hdr); + nlmsg_free(msg); + return -ENOBUFS; +} + +int ieee802154_nl_assoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 cap) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_ASSOCIATE_INDIC); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + + /* FIXME: check that we really received hw address */ + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_SRC_HW_ADDR, addr->hwaddr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_CAPABILITY, cap); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_assoc_indic); + +int ieee802154_nl_assoc_confirm(struct net_device *dev, u16 short_addr, u8 status) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_ASSOCIATE_CONF); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + + NLA_PUT_U16(msg, IEEE802154_ATTR_SHORT_ADDR, short_addr); + NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_assoc_confirm); + +int ieee802154_nl_disassoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 reason) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_DISASSOCIATE_INDIC); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + + if (addr->addr_type == IEEE802154_ADDR_LONG) + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_SRC_HW_ADDR, addr->hwaddr); + else + NLA_PUT_U16(msg, IEEE802154_ATTR_SRC_SHORT_ADDR, addr->short_addr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_REASON, reason); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_disassoc_indic); + +int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_DISASSOCIATE_CONF); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_disassoc_confirm); + +int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid, u16 coord_addr) /* TODO */ +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_BEACON_NOTIFY_INDIC); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + NLA_PUT_U16(msg, IEEE802154_ATTR_COORD_SHORT_ADDR, coord_addr); + NLA_PUT_U16(msg, IEEE802154_ATTR_COORD_PAN_ID, panid); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_beacon_indic); + +int ieee802154_nl_scan_confirm(struct net_device *dev, u8 status, u8 scan_type, u32 unscanned, + u8 *edl/* , struct list_head *pan_desc_list */) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_SCAN_CONF); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status); + NLA_PUT_U8(msg, IEEE802154_ATTR_SCAN_TYPE, scan_type); + NLA_PUT_U32(msg, IEEE802154_ATTR_CHANNELS, unscanned); + + if (edl) + NLA_PUT(msg, IEEE802154_ATTR_ED_LIST, 27, edl); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_scan_confirm); + +/* Requests from userspace */ +static struct net_device *ieee802154_nl_get_dev(struct genl_info *info) +{ + struct net_device *dev; + + if (info->attrs[IEEE802154_ATTR_DEV_NAME]) { + char name[IFNAMSIZ + 1]; + nla_strlcpy(name, info->attrs[IEEE802154_ATTR_DEV_NAME], sizeof(name)); + dev = dev_get_by_name(&init_net, name); + } else if (info->attrs[IEEE802154_ATTR_DEV_INDEX]) + dev = dev_get_by_index(&init_net, nla_get_u32(info->attrs[IEEE802154_ATTR_DEV_INDEX])); + else + return NULL; + + if (dev->type != ARPHRD_IEEE802154) { + dev_put(dev); + return NULL; + } + + return dev; +} + +static int ieee802154_associate_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + int ret = -EINVAL; + + if (!info->attrs[IEEE802154_ATTR_CHANNEL] + || !info->attrs[IEEE802154_ATTR_COORD_PAN_ID] + || (!info->attrs[IEEE802154_ATTR_COORD_HW_ADDR] && !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]) + || !info->attrs[IEEE802154_ATTR_CAPABILITY]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + if (info->attrs[IEEE802154_ATTR_COORD_HW_ADDR]) { + addr.addr_type = IEEE802154_ADDR_LONG; + NLA_GET_HW_ADDR(info->attrs[IEEE802154_ATTR_COORD_HW_ADDR], addr.hwaddr); + } else { + addr.addr_type = IEEE802154_ADDR_SHORT; + addr.short_addr = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]); + } + addr.pan_id = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_PAN_ID]); + + ret = IEEE802154_MLME_OPS(dev)->assoc_req(dev, &addr, + nla_get_u8(info->attrs[IEEE802154_ATTR_CHANNEL]), + nla_get_u8(info->attrs[IEEE802154_ATTR_CAPABILITY])); + + dev_put(dev); + return ret; +} + +static int ieee802154_associate_resp(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + int ret = -EINVAL; + + if (!info->attrs[IEEE802154_ATTR_STATUS] + || !info->attrs[IEEE802154_ATTR_DEST_HW_ADDR] + || !info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + addr.addr_type = IEEE802154_ADDR_LONG; + NLA_GET_HW_ADDR(info->attrs[IEEE802154_ATTR_DEST_HW_ADDR], addr.hwaddr); + addr.pan_id = IEEE802154_MLME_OPS(dev)->get_pan_id(dev); + + + ret = IEEE802154_MLME_OPS(dev)->assoc_resp(dev, &addr, + nla_get_u16(info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]), + nla_get_u8(info->attrs[IEEE802154_ATTR_STATUS])); + + dev_put(dev); + return ret; +} + +static int ieee802154_disassociate_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + int ret = -EINVAL; + + if ((!info->attrs[IEEE802154_ATTR_DEST_HW_ADDR] && !info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]) + || !info->attrs[IEEE802154_ATTR_REASON]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + if (info->attrs[IEEE802154_ATTR_DEST_HW_ADDR]) { + addr.addr_type = IEEE802154_ADDR_LONG; + NLA_GET_HW_ADDR(info->attrs[IEEE802154_ATTR_DEST_HW_ADDR], addr.hwaddr); + } else { + addr.addr_type = IEEE802154_ADDR_SHORT; + addr.short_addr = nla_get_u16(info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]); + } + addr.pan_id = IEEE802154_MLME_OPS(dev)->get_pan_id(dev); + + ret = IEEE802154_MLME_OPS(dev)->disassoc_req(dev, &addr, + nla_get_u8(info->attrs[IEEE802154_ATTR_REASON])); + + dev_put(dev); + return ret; +} + +/* + * PANid, channel, beacon_order = 15, superframe_order = 15, + * PAN_coordinator, battery_life_extension = 0, + * coord_realignment = 0, security_enable = 0 +*/ +static int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + + u8 channel, bcn_ord, sf_ord; + int pan_coord, blx, coord_realign; + int ret; + + if (!info->attrs[IEEE802154_ATTR_COORD_PAN_ID] + || !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR] + || !info->attrs[IEEE802154_ATTR_CHANNEL] + || !info->attrs[IEEE802154_ATTR_BCN_ORD] + || !info->attrs[IEEE802154_ATTR_SF_ORD] + || !info->attrs[IEEE802154_ATTR_PAN_COORD] + || !info->attrs[IEEE802154_ATTR_BAT_EXT] + || !info->attrs[IEEE802154_ATTR_COORD_REALIGN] + ) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + addr.addr_type = IEEE802154_ADDR_SHORT; + addr.short_addr = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]); + addr.pan_id = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_PAN_ID]); + + channel = nla_get_u8(info->attrs[IEEE802154_ATTR_CHANNEL]); + bcn_ord = nla_get_u8(info->attrs[IEEE802154_ATTR_BCN_ORD]); + sf_ord = nla_get_u8(info->attrs[IEEE802154_ATTR_SF_ORD]); + pan_coord = nla_get_u8(info->attrs[IEEE802154_ATTR_PAN_COORD]); + blx = nla_get_u8(info->attrs[IEEE802154_ATTR_BAT_EXT]); + coord_realign = nla_get_u8(info->attrs[IEEE802154_ATTR_COORD_REALIGN]); + + ret = IEEE802154_MLME_OPS(dev)->start_req(dev, &addr, channel, bcn_ord, sf_ord, + pan_coord, blx, coord_realign); + + dev_put(dev); + return ret; +} + +static int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + int ret; + u8 type; + u32 channels; + u8 duration; + + if (!info->attrs[IEEE802154_ATTR_SCAN_TYPE] + || !info->attrs[IEEE802154_ATTR_CHANNELS] + || !info->attrs[IEEE802154_ATTR_DURATION]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + type = nla_get_u8(info->attrs[IEEE802154_ATTR_SCAN_TYPE]); + channels = nla_get_u32(info->attrs[IEEE802154_ATTR_CHANNELS]); + duration = nla_get_u8(info->attrs[IEEE802154_ATTR_DURATION]); + + ret = IEEE802154_MLME_OPS(dev)->scan_req(dev, type, channels, duration); + + dev_put(dev); + return ret; +} + +#define IEEE802154_OP(_cmd, _func) \ + { \ + .cmd = _cmd, \ + .policy = ieee802154_policy, \ + .doit = _func, \ + .dumpit = NULL, \ + .flags = GENL_ADMIN_PERM, \ + } + +static struct genl_ops ieee802154_coordinator_ops[] = { + IEEE802154_OP(IEEE802154_ASSOCIATE_REQ, ieee802154_associate_req), + IEEE802154_OP(IEEE802154_ASSOCIATE_RESP, ieee802154_associate_resp), + IEEE802154_OP(IEEE802154_DISASSOCIATE_REQ, ieee802154_disassociate_req), + IEEE802154_OP(IEEE802154_SCAN_REQ, ieee802154_scan_req), + IEEE802154_OP(IEEE802154_START_REQ, ieee802154_start_req), +}; + +static int __init ieee802154_nl_init(void) +{ + int rc; + int i; + + rc = genl_register_family(&ieee802154_coordinator_family); + if (rc) + goto fail; + + rc = genl_register_mc_group(&ieee802154_coordinator_family, &ieee802154_coord_mcgrp); + if (rc) + goto fail; + + rc = genl_register_mc_group(&ieee802154_coordinator_family, &ieee802154_beacon_mcgrp); + if (rc) + goto fail; + + + for (i = 0; i < ARRAY_SIZE(ieee802154_coordinator_ops); i++) { + rc = genl_register_ops(&ieee802154_coordinator_family, &ieee802154_coordinator_ops[i]); + if (rc) + goto fail; + } + + return 0; + +fail: + genl_unregister_family(&ieee802154_coordinator_family); + return rc; +} +module_init(ieee802154_nl_init); + +static void __exit ieee802154_nl_exit(void) +{ + genl_unregister_family(&ieee802154_coordinator_family); +} +module_exit(ieee802154_nl_exit); + -- 1.6.3.1 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH 5/6] ieee802154: add documentation about our stack 2009-06-03 9:33 ` [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices Dmitry Eremin-Solenikov @ 2009-06-03 9:33 ` Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 6/6] ieee802154: add simple HardMAC driver sample Dmitry Eremin-Solenikov 2009-06-03 9:39 ` [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices Johannes Berg 1 sibling, 1 reply; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 9:33 UTC (permalink / raw) To: linux-kernel Cc: netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Dmitry Eremin-Solenikov Add MAINTAINERS entry and a small text describing our stack interfaces, how to hook the drivers, etc. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Sergey Lapin <slapin@ossfans.org> --- Documentation/networking/ieee802154.txt | 76 +++++++++++++++++++++++++++++++ MAINTAINERS | 12 +++++ 2 files changed, 88 insertions(+), 0 deletions(-) create mode 100644 Documentation/networking/ieee802154.txt diff --git a/Documentation/networking/ieee802154.txt b/Documentation/networking/ieee802154.txt new file mode 100644 index 0000000..a0280ad --- /dev/null +++ b/Documentation/networking/ieee802154.txt @@ -0,0 +1,76 @@ + + Linux IEEE 802.15.4 implementation + + +Introduction +============ + +The Linux-ZigBee project goal is to provide complete implementation +of IEEE 802.15.4 / ZigBee / 6LoWPAN protocols. IEEE 802.15.4 is a stack +of protocols for organizing Low-Rate Wireless Personal Area Networks. + +Currently only IEEE 802.15.4 layer is implemented. We have choosen +to use plain Berkeley socket API, the generic Linux networking stack +to transfer IEEE 802.15.4 messages and a special protocol over genetlink +for configuration/management + + +Socket API +========== + +int sd = socket(PF_IEEE802154, SOCK_DGRAM, 0); +..... + +The address family, socket addresses etc. are defined in the +include/net/ieee802154/af_ieee802154.h header or in the special header +in our userspace package (see either linux-zigbee sourceforge download page +or git tree at git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee). + +One can use SOCK_RAW for passing raw data towards device xmit function. YMMV. + + +MLME - MAC Level Management +============================ + +Most of IEEE 802.15.4 MLME interfaces are directly mapped on netlink commands. +See the include/net/ieee802154/nl802154.h header. Our userspace tools package +(see above) provides CLI configuration utility for radio interfaces and simple +coordinator for IEEE 802.15.4 networks as an example users of MLME protocol. + + +Kernel side +============= + +Like with WiFi, there are several types of devices implementing IEEE 802.15.4. +1) 'HardMAC'. The MAC layer is implemented in the device itself, the device + exports MLME and data API. +2) 'SoftMAC' or just radio. These types of devices are just radio transceivers + possibly with some kinds of acceleration like automatic CRC computation and + comparation, automagic ACK handling, address matching, etc. + +Those types of devices require different approach to be hooked into Linux kernel. + + +HardMAC +======= + +See the header include/net/ieee802154/netdevice.h. You have to implement Linux +net_device, with .type = ARPHRD_IEEE802154. Data is exchanged with socket family +code via plain sk_buffs. The control block of sk_buffs will contain additional +info as described in the struct ieee802154_mac_cb. + +To hook the MLME interface you have to populate the ml_priv field of your +net_device with a pointer to struct ieee802154_mlme_ops instance. All fields are +required. + +We provide an example of simple HardMAC driver at drivers/ieee802154/fakehard.c + + +SoftMAC +======= + +We are going to provide intermediate layer impelementing IEEE 802.15.4 MAC +in software. This is currently WIP. + +See header include/net/ieee802154/mac802154.h and several drivers in +drivers/ieee802154/ diff --git a/MAINTAINERS b/MAINTAINERS index 77cbfb1..d7214c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2807,6 +2807,18 @@ L: linux1394-devel@lists.sourceforge.net S: Maintained F: drivers/ieee1394/raw1394* +IEEE 802.15.4 SUBSYSTEM +P: Dmitry Eremin-Solenikov +M: dbaryshkov@gmail.com +P: Sergey Lapin +M: slapin@ossfans.org +L: linux-zigbee-devel@lists.sourceforge.net +W: http://apps.sourceforge.net/trac/linux-zigbee +T: git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git +S: Maintained +F: net/ieee802154/ +F: drivers/ieee801254/ + INTEGRITY MEASUREMENT ARCHITECTURE (IMA) P: Mimi Zohar M: zohar@us.ibm.com -- 1.6.3.1 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* [PATCH 6/6] ieee802154: add simple HardMAC driver sample 2009-06-03 9:33 ` [PATCH 5/6] ieee802154: add documentation about our stack Dmitry Eremin-Solenikov @ 2009-06-03 9:33 ` Dmitry Eremin-Solenikov 0 siblings, 0 replies; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 9:33 UTC (permalink / raw) To: linux-kernel Cc: netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Dmitry Eremin-Solenikov fakehard is a really simple driver implementing only necessary callbacks and serves the role of an example of driver for HardMAC IEEE 802.15.4 device. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Sergey Lapin <slapin@ossfans.org> --- drivers/Makefile | 1 + drivers/ieee802154/Kconfig | 21 ++++ drivers/ieee802154/Makefile | 3 + drivers/ieee802154/fakehard.c | 258 +++++++++++++++++++++++++++++++++++++++++ drivers/net/Kconfig | 2 + 5 files changed, 285 insertions(+), 0 deletions(-) create mode 100644 drivers/ieee802154/Kconfig create mode 100644 drivers/ieee802154/Makefile create mode 100644 drivers/ieee802154/fakehard.c diff --git a/drivers/Makefile b/drivers/Makefile index 1266ead..9e7d4e5 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -107,3 +107,4 @@ obj-$(CONFIG_SSB) += ssb/ obj-$(CONFIG_VIRTIO) += virtio/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/ +obj-y += ieee802154/ diff --git a/drivers/ieee802154/Kconfig b/drivers/ieee802154/Kconfig new file mode 100644 index 0000000..2aaa5b6 --- /dev/null +++ b/drivers/ieee802154/Kconfig @@ -0,0 +1,21 @@ +menuconfig IEEE802154_DRIVERS + bool "IEEE 802.15.4 drivers" + depends on NETDEVICES && IEEE802154 + default y + ---help--- + Say Y here to get to see options for IEEE 802.15.4 Low-Rate + Wireless Personal Area Network device drivers. This option alone + does not add any kernel code. + + If you say N, all options in this submenu will be skipped and disabled. + +config IEEE802154_FAKEHARD + tristate "Fake LR-WPAN driver with several interconnected devices" + depends on IEEE802154_DRIVERS + ---help--- + Say Y here to enable the fake driver that serves as an example + of HardMAC device driver. + + This driver can also be built as a module. To do so say M here. + The module will be called 'fakehard'. + diff --git a/drivers/ieee802154/Makefile b/drivers/ieee802154/Makefile new file mode 100644 index 0000000..e0e8e1a --- /dev/null +++ b/drivers/ieee802154/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_IEEE802154_FAKEHARD) += fakehard.o + +EXTRA_CFLAGS += -DDEBUG -DCONFIG_FFD diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c new file mode 100644 index 0000000..82664a5 --- /dev/null +++ b/drivers/ieee802154/fakehard.c @@ -0,0 +1,258 @@ +/* + * Sample driver for HardMAC IEEE 802.15.4 devices + * + * Copyright (C) 2009 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Dmitry Eremin-Solenikov <dmitry.baryshkov@siemens.com> + */ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/netdevice.h> +#include <linux/skbuff.h> +#include <linux/if_arp.h> + +#include <net/ieee802154/af_ieee802154.h> +#include <net/ieee802154/netdevice.h> +#include <net/ieee802154/mac_def.h> +#include <net/ieee802154/nl802154.h> + +static u16 fake_get_pan_id(struct net_device *dev) +{ + BUG_ON(dev->type != ARPHRD_IEEE802154); + + return 0xeba1; +} + +static u16 fake_get_short_addr(struct net_device *dev) +{ + BUG_ON(dev->type != ARPHRD_IEEE802154); + + return 0x1; +} + +static u8 fake_get_dsn(struct net_device *dev) +{ + BUG_ON(dev->type != ARPHRD_IEEE802154); + + return 0x00; /* DSN are implemented in HW, so return just 0 */ +} + +static u8 fake_get_bsn(struct net_device *dev) +{ + BUG_ON(dev->type != ARPHRD_IEEE802154); + + return 0x00; /* BSN are implemented in HW, so return just 0 */ +} + +static int fake_assoc_req(struct net_device *dev, struct ieee802154_addr *addr, u8 channel, u8 cap) +{ + /* We simply emulate it here */ + return ieee802154_nl_assoc_confirm(dev, fake_get_short_addr(dev), IEEE802154_SUCCESS); +} + +static int fake_assoc_resp(struct net_device *dev, struct ieee802154_addr *addr, u16 short_addr, u8 status) +{ + return 0; +} + +static int fake_disassoc_req(struct net_device *dev, struct ieee802154_addr *addr, u8 reason) +{ + return ieee802154_nl_disassoc_confirm(dev, IEEE802154_SUCCESS); +} + +static int fake_start_req(struct net_device *dev, struct ieee802154_addr *addr, + u8 channel, + u8 bcn_ord, u8 sf_ord, u8 pan_coord, u8 blx, + u8 coord_realign) +{ + return 0; +} + +static int fake_scan_req(struct net_device *dev, u8 type, u32 channels, u8 duration) +{ + u8 edl[27] = {}; + return ieee802154_nl_scan_confirm(dev, IEEE802154_SUCCESS, type, channels, + type == IEEE802154_MAC_SCAN_ED ? edl : NULL); +} + +static struct ieee802154_mlme_ops fake_mlme = { + .assoc_req = fake_assoc_req, + .assoc_resp = fake_assoc_resp, + .disassoc_req = fake_disassoc_req, + .start_req = fake_start_req, + .scan_req = fake_scan_req, + + .get_pan_id = fake_get_pan_id, + .get_short_addr = fake_get_short_addr, + .get_dsn = fake_get_dsn, + .get_bsn = fake_get_bsn, +}; + +static int ieee802154_fake_open(struct net_device *dev) +{ + netif_start_queue(dev); + return 0; +} + +static int ieee802154_fake_close(struct net_device *dev) +{ + netif_stop_queue(dev); + return 0; +} + +static int ieee802154_fake_xmit(struct sk_buff *skb, struct net_device *dev) +{ + skb->iif = dev->ifindex; + skb->dev = dev; + dev->stats.tx_packets++; + dev->stats.tx_bytes += skb->len; + + dev->trans_start = jiffies; + + /* FIXME: do hardware work here ... */ + + return 0; +} + + +static int ieee802154_fake_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) +{ + struct sockaddr_ieee802154 *sa = (struct sockaddr_ieee802154 *)&ifr->ifr_addr; + u16 pan_id, short_addr; + + switch (cmd) { + case SIOCGIFADDR: + /* FIXME: fixed here, get from device IRL */ + pan_id = fake_get_pan_id(dev); + short_addr = fake_get_short_addr(dev); + if (pan_id == IEEE802154_PANID_BROADCAST || short_addr == IEEE802154_ADDR_BROADCAST) + return -EADDRNOTAVAIL; + + sa->family = AF_IEEE802154; + sa->addr.addr_type = IEEE802154_ADDR_SHORT; + sa->addr.pan_id = pan_id; + sa->addr.short_addr = short_addr; + return 0; + } + return -ENOIOCTLCMD; +} + +static int ieee802154_fake_mac_addr(struct net_device *dev, void *p) +{ + return -EBUSY; /* HW address is built into the device */ +} + +static const struct net_device_ops fake_ops = { + .ndo_open = ieee802154_fake_open, + .ndo_stop = ieee802154_fake_close, + .ndo_start_xmit = ieee802154_fake_xmit, + .ndo_do_ioctl = ieee802154_fake_ioctl, + .ndo_set_mac_address = ieee802154_fake_mac_addr, +}; + + +static void ieee802154_fake_setup(struct net_device *dev) +{ + dev->addr_len = IEEE802154_ADDR_LEN; + memset(dev->broadcast, 0xff, IEEE802154_ADDR_LEN); + dev->features = NETIF_F_NO_CSUM; + dev->needed_tailroom = 2; /* FCS */ + dev->mtu = 127; + dev->tx_queue_len = 10; + dev->type = ARPHRD_IEEE802154; + dev->flags = IFF_NOARP | IFF_BROADCAST; + dev->watchdog_timeo = 0; +} + + +static int __devinit ieee802154fake_probe(struct platform_device *pdev) +{ + struct net_device *dev = alloc_netdev(0, "hardwpan%d", ieee802154_fake_setup); + int err; + + if (!dev) + return -ENOMEM; + + memcpy(dev->dev_addr, "\xba\xbe\xca\xfe\xde\xad\xbe\xef", dev->addr_len); + memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); + + dev->netdev_ops = &fake_ops; + dev->ml_priv = &fake_mlme; + + /* + * If the name is a format string the caller wants us to do a + * name allocation. + */ + if (strchr(dev->name, '%')) { + err = dev_alloc_name(dev, dev->name); + if (err < 0) + goto out; + } + + SET_NETDEV_DEV(dev, &pdev->dev); + + platform_set_drvdata(pdev, dev); + + err = register_netdev(dev); + if (err < 0) + goto out; + + + dev_info(&pdev->dev, "Added ieee802154 HardMAC hardware\n"); + return 0; + +out: + unregister_netdev(dev); + return err; +} + +static int __devexit ieee802154fake_remove(struct platform_device *pdev) +{ + struct net_device *dev = platform_get_drvdata(pdev); + unregister_netdev(dev); + free_netdev(dev); + return 0; +} + +static struct platform_device *ieee802154fake_dev; + +static struct platform_driver ieee802154fake_driver = { + .probe = ieee802154fake_probe, + .remove = __devexit_p(ieee802154fake_remove), + .driver = { + .name = "ieee802154hardmac", + .owner = THIS_MODULE, + }, +}; + +static __init int fake_init(void) +{ + ieee802154fake_dev = platform_device_register_simple("ieee802154hardmac", -1, NULL, 0); + return platform_driver_register(&ieee802154fake_driver); +} + +static __exit void fake_exit(void) +{ + platform_driver_unregister(&ieee802154fake_driver); + platform_device_unregister(ieee802154fake_dev); +} + +module_init(fake_init); +module_exit(fake_exit); +MODULE_LICENSE("GPL"); + diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 214a92d..ec8cf21 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2704,6 +2704,8 @@ source "drivers/net/wan/Kconfig" source "drivers/atm/Kconfig" +source "drivers/ieee802154/Kconfig" + source "drivers/s390/net/Kconfig" config XEN_NETDEV_FRONTEND -- 1.6.3.1 ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-03 9:33 ` [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 5/6] ieee802154: add documentation about our stack Dmitry Eremin-Solenikov @ 2009-06-03 9:39 ` Johannes Berg 2009-06-03 10:09 ` David Miller 1 sibling, 1 reply; 30+ messages in thread From: Johannes Berg @ 2009-06-03 9:39 UTC (permalink / raw) To: Dmitry Eremin-Solenikov Cc: linux-kernel, netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin [-- Attachment #1: Type: text/plain, Size: 646 bytes --] On Wed, 2009-06-03 at 13:33 +0400, Dmitry Eremin-Solenikov wrote: > +enum { > + __IEEE802154_COMMAND_INVALID, > + > + IEEE802154_ASSOCIATE_REQ, > + IEEE802154_ASSOCIATE_CONF, > + IEEE802154_DISASSOCIATE_REQ, > + IEEE802154_DISASSOCIATE_CONF, > + IEEE802154_GET_REQ, > + IEEE802154_GET_CONF, > +/* IEEE802154_GTS_REQ, */ > +/* IEEE802154_GTS_CONF, */ > + IEEE802154_RESET_REQ, > + IEEE802154_RESET_CONF, > +/* IEEE802154_RX_ENABLE_REQ, */ > +/* IEEE802154_RX_ENABLE_CONF, */ This is a recipe for disaster. Somebody will come along and uncomment things. Why this is bad, I leave as an exercise for the reader. johannes [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 801 bytes --] ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-03 9:39 ` [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices Johannes Berg @ 2009-06-03 10:09 ` David Miller 2009-06-03 10:52 ` Dmitry Eremin-Solenikov 0 siblings, 1 reply; 30+ messages in thread From: David Miller @ 2009-06-03 10:09 UTC (permalink / raw) To: johannes; +Cc: dbaryshkov, linux-kernel, netdev, linux-wireless, sfr, slapin From: Johannes Berg <johannes@sipsolutions.net> Date: Wed, 03 Jun 2009 11:39:24 +0200 > On Wed, 2009-06-03 at 13:33 +0400, Dmitry Eremin-Solenikov wrote: > >> +enum { >> + __IEEE802154_COMMAND_INVALID, >> + >> + IEEE802154_ASSOCIATE_REQ, >> + IEEE802154_ASSOCIATE_CONF, >> + IEEE802154_DISASSOCIATE_REQ, >> + IEEE802154_DISASSOCIATE_CONF, >> + IEEE802154_GET_REQ, >> + IEEE802154_GET_CONF, >> +/* IEEE802154_GTS_REQ, */ >> +/* IEEE802154_GTS_CONF, */ >> + IEEE802154_RESET_REQ, >> + IEEE802154_RESET_CONF, >> +/* IEEE802154_RX_ENABLE_REQ, */ >> +/* IEEE802154_RX_ENABLE_CONF, */ > > This is a recipe for disaster. Somebody will come along and uncomment > things. Why this is bad, I leave as an exercise for the reader. Right, it changes the other request numbers and breaks userspace. Dmitry you have to pick these numbers as fixed numbers now and do so in such a way that they will remain unchanged forever because they are part of the user visible interface. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-03 10:09 ` David Miller @ 2009-06-03 10:52 ` Dmitry Eremin-Solenikov 2009-06-03 11:05 ` Johannes Berg 0 siblings, 1 reply; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 10:52 UTC (permalink / raw) To: David Miller; +Cc: johannes, linux-kernel, netdev, linux-wireless, sfr, slapin On Wed, Jun 03, 2009 at 03:09:11AM -0700, David Miller wrote: > From: Johannes Berg <johannes@sipsolutions.net> > Date: Wed, 03 Jun 2009 11:39:24 +0200 > > > On Wed, 2009-06-03 at 13:33 +0400, Dmitry Eremin-Solenikov wrote: > > > >> +enum { > >> + __IEEE802154_COMMAND_INVALID, > >> + > >> + IEEE802154_ASSOCIATE_REQ, > >> + IEEE802154_ASSOCIATE_CONF, > >> + IEEE802154_DISASSOCIATE_REQ, > >> + IEEE802154_DISASSOCIATE_CONF, > >> + IEEE802154_GET_REQ, > >> + IEEE802154_GET_CONF, > >> +/* IEEE802154_GTS_REQ, */ > >> +/* IEEE802154_GTS_CONF, */ > >> + IEEE802154_RESET_REQ, > >> + IEEE802154_RESET_CONF, > >> +/* IEEE802154_RX_ENABLE_REQ, */ > >> +/* IEEE802154_RX_ENABLE_CONF, */ > > > > This is a recipe for disaster. Somebody will come along and uncomment > > things. Why this is bad, I leave as an exercise for the reader. > > Right, it changes the other request numbers and breaks userspace. > > Dmitry you have to pick these numbers as fixed numbers now and do > so in such a way that they will remain unchanged forever because > they are part of the user visible interface. >From 733dcc791aef46e029e696c9c986e74916ff596b Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Date: Wed, 3 Jun 2009 14:43:41 +0400 Subject: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices Add a netlink interface for configuration of IEEE 802.15.4 device. Also this interface specifies events notification sent by devices towards higher layers. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Sergey Lapin <slapin@ossfans.org> --- include/net/ieee802154/nl802154.h | 166 +++++++++++++ net/ieee802154/Makefile | 3 +- net/ieee802154/netlink.c | 485 +++++++++++++++++++++++++++++++++++++ 3 files changed, 653 insertions(+), 1 deletions(-) create mode 100644 include/net/ieee802154/nl802154.h create mode 100644 net/ieee802154/netlink.c diff --git a/include/net/ieee802154/nl802154.h b/include/net/ieee802154/nl802154.h new file mode 100644 index 0000000..6ff5a83 --- /dev/null +++ b/include/net/ieee802154/nl802154.h @@ -0,0 +1,166 @@ +/* + * ieee802154_nl.h + * + * Copyright (C) 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#ifndef IEEE802154_NL_H +#define IEEE802154_NL_H + +#define IEEE802154_NL_NAME "802.15.4 MAC" +#define IEEE802154_MCAST_COORD_NAME "coordinator" +#define IEEE802154_MCAST_BEACON_NAME "beacon" + +enum { + __IEEE802154_ATTR_INVALID, + + IEEE802154_ATTR_DEV_NAME, + IEEE802154_ATTR_DEV_INDEX, + + IEEE802154_ATTR_STATUS, + + IEEE802154_ATTR_SHORT_ADDR, + IEEE802154_ATTR_HW_ADDR, + IEEE802154_ATTR_PAN_ID, + + IEEE802154_ATTR_CHANNEL, + + IEEE802154_ATTR_COORD_SHORT_ADDR, + IEEE802154_ATTR_COORD_HW_ADDR, + IEEE802154_ATTR_COORD_PAN_ID, + + IEEE802154_ATTR_SRC_SHORT_ADDR, + IEEE802154_ATTR_SRC_HW_ADDR, + IEEE802154_ATTR_SRC_PAN_ID, + + IEEE802154_ATTR_DEST_SHORT_ADDR, + IEEE802154_ATTR_DEST_HW_ADDR, + IEEE802154_ATTR_DEST_PAN_ID, + + IEEE802154_ATTR_CAPABILITY, /* FIXME: this is association */ + IEEE802154_ATTR_REASON, + IEEE802154_ATTR_SCAN_TYPE, + IEEE802154_ATTR_CHANNELS, + IEEE802154_ATTR_DURATION, + IEEE802154_ATTR_ED_LIST, + IEEE802154_ATTR_BCN_ORD, + IEEE802154_ATTR_SF_ORD, + IEEE802154_ATTR_PAN_COORD, + IEEE802154_ATTR_BAT_EXT, + IEEE802154_ATTR_COORD_REALIGN, + IEEE802154_ATTR_SEC, + + __IEEE802154_ATTR_MAX, +}; + +#define IEEE802154_ATTR_MAX (__IEEE802154_ATTR_MAX - 1) +#define NLA_HW_ADDR NLA_U64 +#define NLA_GET_HW_ADDR(attr, addr) do { u64 _temp = nla_get_u64(attr); memcpy(addr, &_temp, 8); } while (0) +#define NLA_PUT_HW_ADDR(msg, attr, addr) do { u64 _temp; memcpy(&_temp, addr, 8); NLA_PUT_U64(msg, attr, _temp); } while (0) + +#ifdef IEEE802154_NL_WANT_POLICY +static struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = { + [IEEE802154_ATTR_DEV_NAME] = { .type = NLA_STRING, }, + [IEEE802154_ATTR_DEV_INDEX] = { .type = NLA_U32, }, + + [IEEE802154_ATTR_STATUS] = { .type = NLA_U8, }, + [IEEE802154_ATTR_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_PAN_ID] = { .type = NLA_U16, }, + [IEEE802154_ATTR_CHANNEL] = { .type = NLA_U8, }, + [IEEE802154_ATTR_COORD_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_COORD_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_COORD_PAN_ID] = { .type = NLA_U16, }, + [IEEE802154_ATTR_SRC_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_SRC_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_SRC_PAN_ID] = { .type = NLA_U16, }, + [IEEE802154_ATTR_DEST_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_DEST_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_DEST_PAN_ID] = { .type = NLA_U16, }, + + [IEEE802154_ATTR_CAPABILITY] = { .type = NLA_U8, }, + [IEEE802154_ATTR_REASON] = { .type = NLA_U8, }, + [IEEE802154_ATTR_SCAN_TYPE] = { .type = NLA_U8, }, + [IEEE802154_ATTR_CHANNELS] = { .type = NLA_U32, }, + [IEEE802154_ATTR_DURATION] = { .type = NLA_U8, }, +#ifdef __KERNEL__ + [IEEE802154_ATTR_ED_LIST] = { .len = 27 }, +#else + [IEEE802154_ATTR_ED_LIST] = { .minlen = 27, .maxlen = 27 }, +#endif +}; +#endif + +/* commands */ +/* REQ should be responded with CONF + * and INDIC with RESP + */ +enum { + __IEEE802154_COMMAND_INVALID, + + IEEE802154_ASSOCIATE_REQ, + IEEE802154_ASSOCIATE_CONF, + IEEE802154_DISASSOCIATE_REQ, + IEEE802154_DISASSOCIATE_CONF, + IEEE802154_GET_REQ, + IEEE802154_GET_CONF, + IEEE802154_RESET_REQ, + IEEE802154_RESET_CONF, + IEEE802154_SCAN_REQ, + IEEE802154_SCAN_CONF, + IEEE802154_SET_REQ, + IEEE802154_SET_CONF, + IEEE802154_START_REQ, + IEEE802154_START_CONF, + IEEE802154_SYNC_REQ, + IEEE802154_POLL_REQ, + IEEE802154_POLL_CONF, + + IEEE802154_ASSOCIATE_INDIC, + IEEE802154_ASSOCIATE_RESP, + IEEE802154_DISASSOCIATE_INDIC, + IEEE802154_BEACON_NOTIFY_INDIC, + IEEE802154_ORPHAN_INDIC, + IEEE802154_ORPHAN_RESP, + IEEE802154_COMM_STATUS_INDIC, + IEEE802154_SYNC_LOSS_INDIC, + + IEEE802154_GTS_REQ, /* Not supported yet */ + IEEE802154_GTS_INDIC, /* Not supported yet */ + IEEE802154_GTS_CONF, /* Not supported yet */ + IEEE802154_RX_ENABLE_REQ, /* Not supported yet */ + IEEE802154_RX_ENABLE_CONF, /* Not supported yet */ + + __IEEE802154_CMD_MAX, +}; + +#define IEEE802154_CMD_MAX (__IEEE802154_CMD_MAX - 1) + + +#ifdef __KERNEL__ +struct net_device; + +int ieee802154_nl_assoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 cap); +int ieee802154_nl_assoc_confirm(struct net_device *dev, u16 short_addr, u8 status); +int ieee802154_nl_disassoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 reason); +int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status); +int ieee802154_nl_scan_confirm(struct net_device *dev, u8 status, u8 scan_type, u32 unscanned, + u8 *edl/*, struct list_head *pan_desc_list */); +int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid, u16 coord_addr); /* TODO */ +#endif + +#endif diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile index cb88054..7c0b025 100644 --- a/net/ieee802154/Makefile +++ b/net/ieee802154/Makefile @@ -1,4 +1,5 @@ -obj-$(CONFIG_IEEE802154) += af_802154.o +obj-$(CONFIG_IEEE802154) += nl802154.o af_802154.o +nl802154-objs := netlink.o af_802154-objs := af_ieee802154.o raw.o dgram.o EXTRA_CFLAGS += -Wall -DDEBUG diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c new file mode 100644 index 0000000..eafdc4d --- /dev/null +++ b/net/ieee802154/netlink.c @@ -0,0 +1,485 @@ +/* + * Netlink inteface for IEEE 802.15.4 stack + * + * Copyright 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Sergey Lapin <sergey.lapin@siemens.com> + * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> + */ + +#include <linux/kernel.h> +#include <linux/if_arp.h> +#include <net/netlink.h> +#include <net/genetlink.h> +#include <linux/netdevice.h> +#include <net/ieee802154/af_ieee802154.h> +#define IEEE802154_NL_WANT_POLICY +#include <net/ieee802154/nl802154.h> +#include <net/ieee802154/netdevice.h> + +static unsigned int ieee802154_seq_num; + +static struct genl_family ieee802154_coordinator_family = { + .id = GENL_ID_GENERATE, + .hdrsize = 0, + .name = IEEE802154_NL_NAME, + .version = 1, + .maxattr = IEEE802154_ATTR_MAX, +}; + +static struct genl_multicast_group ieee802154_coord_mcgrp = { + .name = IEEE802154_MCAST_COORD_NAME, +}; + +static struct genl_multicast_group ieee802154_beacon_mcgrp = { + .name = IEEE802154_MCAST_BEACON_NAME, +}; + +/* Requests to userspace */ +static struct sk_buff *ieee802154_nl_create(int flags, u8 req) +{ + void *hdr; + struct sk_buff *msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC); + + if (!msg) + return NULL; + + hdr = genlmsg_put(msg, 0, ieee802154_seq_num++, &ieee802154_coordinator_family, flags, req); + if (!hdr) { + nlmsg_free(msg); + return NULL; + } + + return msg; +} + +static int ieee802154_nl_finish(struct sk_buff *msg) +{ + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ + + if (!genlmsg_end(msg, hdr)) + goto out; + + return genlmsg_multicast(msg, 0, ieee802154_coord_mcgrp.id, GFP_ATOMIC); +out: + nlmsg_free(msg); + return -ENOBUFS; +} + +static int ieee802154_nl_put_failure(struct sk_buff *msg) +{ + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ + genlmsg_cancel(msg, hdr); + nlmsg_free(msg); + return -ENOBUFS; +} + +int ieee802154_nl_assoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 cap) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_ASSOCIATE_INDIC); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + + /* FIXME: check that we really received hw address */ + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_SRC_HW_ADDR, addr->hwaddr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_CAPABILITY, cap); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_assoc_indic); + +int ieee802154_nl_assoc_confirm(struct net_device *dev, u16 short_addr, u8 status) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_ASSOCIATE_CONF); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + + NLA_PUT_U16(msg, IEEE802154_ATTR_SHORT_ADDR, short_addr); + NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_assoc_confirm); + +int ieee802154_nl_disassoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 reason) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_DISASSOCIATE_INDIC); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + + if (addr->addr_type == IEEE802154_ADDR_LONG) + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_SRC_HW_ADDR, addr->hwaddr); + else + NLA_PUT_U16(msg, IEEE802154_ATTR_SRC_SHORT_ADDR, addr->short_addr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_REASON, reason); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_disassoc_indic); + +int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_DISASSOCIATE_CONF); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_disassoc_confirm); + +int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid, u16 coord_addr) /* TODO */ +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_BEACON_NOTIFY_INDIC); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + NLA_PUT_U16(msg, IEEE802154_ATTR_COORD_SHORT_ADDR, coord_addr); + NLA_PUT_U16(msg, IEEE802154_ATTR_COORD_PAN_ID, panid); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_beacon_indic); + +int ieee802154_nl_scan_confirm(struct net_device *dev, u8 status, u8 scan_type, u32 unscanned, + u8 *edl/* , struct list_head *pan_desc_list */) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_SCAN_CONF); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status); + NLA_PUT_U8(msg, IEEE802154_ATTR_SCAN_TYPE, scan_type); + NLA_PUT_U32(msg, IEEE802154_ATTR_CHANNELS, unscanned); + + if (edl) + NLA_PUT(msg, IEEE802154_ATTR_ED_LIST, 27, edl); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_scan_confirm); + +/* Requests from userspace */ +static struct net_device *ieee802154_nl_get_dev(struct genl_info *info) +{ + struct net_device *dev; + + if (info->attrs[IEEE802154_ATTR_DEV_NAME]) { + char name[IFNAMSIZ + 1]; + nla_strlcpy(name, info->attrs[IEEE802154_ATTR_DEV_NAME], sizeof(name)); + dev = dev_get_by_name(&init_net, name); + } else if (info->attrs[IEEE802154_ATTR_DEV_INDEX]) + dev = dev_get_by_index(&init_net, nla_get_u32(info->attrs[IEEE802154_ATTR_DEV_INDEX])); + else + return NULL; + + if (dev->type != ARPHRD_IEEE802154) { + dev_put(dev); + return NULL; + } + + return dev; +} + +static int ieee802154_associate_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + int ret = -EINVAL; + + if (!info->attrs[IEEE802154_ATTR_CHANNEL] + || !info->attrs[IEEE802154_ATTR_COORD_PAN_ID] + || (!info->attrs[IEEE802154_ATTR_COORD_HW_ADDR] && !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]) + || !info->attrs[IEEE802154_ATTR_CAPABILITY]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + if (info->attrs[IEEE802154_ATTR_COORD_HW_ADDR]) { + addr.addr_type = IEEE802154_ADDR_LONG; + NLA_GET_HW_ADDR(info->attrs[IEEE802154_ATTR_COORD_HW_ADDR], addr.hwaddr); + } else { + addr.addr_type = IEEE802154_ADDR_SHORT; + addr.short_addr = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]); + } + addr.pan_id = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_PAN_ID]); + + ret = IEEE802154_MLME_OPS(dev)->assoc_req(dev, &addr, + nla_get_u8(info->attrs[IEEE802154_ATTR_CHANNEL]), + nla_get_u8(info->attrs[IEEE802154_ATTR_CAPABILITY])); + + dev_put(dev); + return ret; +} + +static int ieee802154_associate_resp(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + int ret = -EINVAL; + + if (!info->attrs[IEEE802154_ATTR_STATUS] + || !info->attrs[IEEE802154_ATTR_DEST_HW_ADDR] + || !info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + addr.addr_type = IEEE802154_ADDR_LONG; + NLA_GET_HW_ADDR(info->attrs[IEEE802154_ATTR_DEST_HW_ADDR], addr.hwaddr); + addr.pan_id = IEEE802154_MLME_OPS(dev)->get_pan_id(dev); + + + ret = IEEE802154_MLME_OPS(dev)->assoc_resp(dev, &addr, + nla_get_u16(info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]), + nla_get_u8(info->attrs[IEEE802154_ATTR_STATUS])); + + dev_put(dev); + return ret; +} + +static int ieee802154_disassociate_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + int ret = -EINVAL; + + if ((!info->attrs[IEEE802154_ATTR_DEST_HW_ADDR] && !info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]) + || !info->attrs[IEEE802154_ATTR_REASON]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + if (info->attrs[IEEE802154_ATTR_DEST_HW_ADDR]) { + addr.addr_type = IEEE802154_ADDR_LONG; + NLA_GET_HW_ADDR(info->attrs[IEEE802154_ATTR_DEST_HW_ADDR], addr.hwaddr); + } else { + addr.addr_type = IEEE802154_ADDR_SHORT; + addr.short_addr = nla_get_u16(info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]); + } + addr.pan_id = IEEE802154_MLME_OPS(dev)->get_pan_id(dev); + + ret = IEEE802154_MLME_OPS(dev)->disassoc_req(dev, &addr, + nla_get_u8(info->attrs[IEEE802154_ATTR_REASON])); + + dev_put(dev); + return ret; +} + +/* + * PANid, channel, beacon_order = 15, superframe_order = 15, + * PAN_coordinator, battery_life_extension = 0, + * coord_realignment = 0, security_enable = 0 +*/ +static int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + + u8 channel, bcn_ord, sf_ord; + int pan_coord, blx, coord_realign; + int ret; + + if (!info->attrs[IEEE802154_ATTR_COORD_PAN_ID] + || !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR] + || !info->attrs[IEEE802154_ATTR_CHANNEL] + || !info->attrs[IEEE802154_ATTR_BCN_ORD] + || !info->attrs[IEEE802154_ATTR_SF_ORD] + || !info->attrs[IEEE802154_ATTR_PAN_COORD] + || !info->attrs[IEEE802154_ATTR_BAT_EXT] + || !info->attrs[IEEE802154_ATTR_COORD_REALIGN] + ) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + addr.addr_type = IEEE802154_ADDR_SHORT; + addr.short_addr = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]); + addr.pan_id = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_PAN_ID]); + + channel = nla_get_u8(info->attrs[IEEE802154_ATTR_CHANNEL]); + bcn_ord = nla_get_u8(info->attrs[IEEE802154_ATTR_BCN_ORD]); + sf_ord = nla_get_u8(info->attrs[IEEE802154_ATTR_SF_ORD]); + pan_coord = nla_get_u8(info->attrs[IEEE802154_ATTR_PAN_COORD]); + blx = nla_get_u8(info->attrs[IEEE802154_ATTR_BAT_EXT]); + coord_realign = nla_get_u8(info->attrs[IEEE802154_ATTR_COORD_REALIGN]); + + ret = IEEE802154_MLME_OPS(dev)->start_req(dev, &addr, channel, bcn_ord, sf_ord, + pan_coord, blx, coord_realign); + + dev_put(dev); + return ret; +} + +static int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + int ret; + u8 type; + u32 channels; + u8 duration; + + if (!info->attrs[IEEE802154_ATTR_SCAN_TYPE] + || !info->attrs[IEEE802154_ATTR_CHANNELS] + || !info->attrs[IEEE802154_ATTR_DURATION]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + type = nla_get_u8(info->attrs[IEEE802154_ATTR_SCAN_TYPE]); + channels = nla_get_u32(info->attrs[IEEE802154_ATTR_CHANNELS]); + duration = nla_get_u8(info->attrs[IEEE802154_ATTR_DURATION]); + + ret = IEEE802154_MLME_OPS(dev)->scan_req(dev, type, channels, duration); + + dev_put(dev); + return ret; +} + +#define IEEE802154_OP(_cmd, _func) \ + { \ + .cmd = _cmd, \ + .policy = ieee802154_policy, \ + .doit = _func, \ + .dumpit = NULL, \ + .flags = GENL_ADMIN_PERM, \ + } + +static struct genl_ops ieee802154_coordinator_ops[] = { + IEEE802154_OP(IEEE802154_ASSOCIATE_REQ, ieee802154_associate_req), + IEEE802154_OP(IEEE802154_ASSOCIATE_RESP, ieee802154_associate_resp), + IEEE802154_OP(IEEE802154_DISASSOCIATE_REQ, ieee802154_disassociate_req), + IEEE802154_OP(IEEE802154_SCAN_REQ, ieee802154_scan_req), + IEEE802154_OP(IEEE802154_START_REQ, ieee802154_start_req), +}; + +static int __init ieee802154_nl_init(void) +{ + int rc; + int i; + + rc = genl_register_family(&ieee802154_coordinator_family); + if (rc) + goto fail; + + rc = genl_register_mc_group(&ieee802154_coordinator_family, &ieee802154_coord_mcgrp); + if (rc) + goto fail; + + rc = genl_register_mc_group(&ieee802154_coordinator_family, &ieee802154_beacon_mcgrp); + if (rc) + goto fail; + + + for (i = 0; i < ARRAY_SIZE(ieee802154_coordinator_ops); i++) { + rc = genl_register_ops(&ieee802154_coordinator_family, &ieee802154_coordinator_ops[i]); + if (rc) + goto fail; + } + + return 0; + +fail: + genl_unregister_family(&ieee802154_coordinator_family); + return rc; +} +module_init(ieee802154_nl_init); + +static void __exit ieee802154_nl_exit(void) +{ + genl_unregister_family(&ieee802154_coordinator_family); +} +module_exit(ieee802154_nl_exit); + -- 1.6.3.1 -- With best wishes Dmitry ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-03 10:52 ` Dmitry Eremin-Solenikov @ 2009-06-03 11:05 ` Johannes Berg 2009-06-03 12:27 ` Dmitry Eremin-Solenikov ` (2 more replies) 0 siblings, 3 replies; 30+ messages in thread From: Johannes Berg @ 2009-06-03 11:05 UTC (permalink / raw) To: Dmitry Eremin-Solenikov Cc: David Miller, linux-kernel, netdev, linux-wireless, sfr, slapin [-- Attachment #1: Type: text/plain, Size: 3885 bytes --] On Wed, 2009-06-03 at 14:52 +0400, Dmitry Eremin-Solenikov wrote: > + IEEE802154_ATTR_CAPABILITY, /* FIXME: this is association */ Fix what? > +#define IEEE802154_ATTR_MAX (__IEEE802154_ATTR_MAX - 1) > +#define NLA_HW_ADDR NLA_U64 > +#define NLA_GET_HW_ADDR(attr, addr) do { u64 _temp = nla_get_u64(attr); memcpy(addr, &_temp, 8); } while (0) > +#define NLA_PUT_HW_ADDR(msg, attr, addr) do { u64 _temp; memcpy(&_temp, addr, 8); NLA_PUT_U64(msg, attr, _temp); } while (0) I really don't like this namespace pollution. > +#ifdef IEEE802154_NL_WANT_POLICY > +static struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = { Ho humm. This shouldn't be in a header file. Not even with an #ifdef that exactly one C file then sets. > + [IEEE802154_ATTR_DURATION] = { .type = NLA_U8, }, > +#ifdef __KERNEL__ > + [IEEE802154_ATTR_ED_LIST] = { .len = 27 }, > +#else Ick. > +/* commands */ > +/* REQ should be responded with CONF > + * and INDIC with RESP > + */ > +enum { kernel-doc explaining the commands would be immensely helpful. > + IEEE802154_GTS_REQ, /* Not supported yet */ > + IEEE802154_GTS_INDIC, /* Not supported yet */ > + IEEE802154_GTS_CONF, /* Not supported yet */ > + IEEE802154_RX_ENABLE_REQ, /* Not supported yet */ > + IEEE802154_RX_ENABLE_CONF, /* Not supported yet */ Just leave it out then. You're fixing ABI here. > +#ifdef __KERNEL__ > +struct net_device; > + > +int ieee802154_nl_assoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 cap); > +int ieee802154_nl_assoc_confirm(struct net_device *dev, u16 short_addr, u8 status); > +int ieee802154_nl_disassoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 reason); > +int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status); > +int ieee802154_nl_scan_confirm(struct net_device *dev, u8 status, u8 scan_type, u32 unscanned, > + u8 *edl/*, struct list_head *pan_desc_list */); > +int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid, u16 coord_addr); /* TODO */ > +#endif Why not just use two header files, one in net/ and one in linux/? > -obj-$(CONFIG_IEEE802154) += af_802154.o > +obj-$(CONFIG_IEEE802154) += nl802154.o af_802154.o > +nl802154-objs := netlink.o That doesn't make any sense. Why the indirection? > +#include <net/ieee802154/af_ieee802154.h> > +#define IEEE802154_NL_WANT_POLICY > +#include <net/ieee802154/nl802154.h> Like I thought. That's ugly. > +static int ieee802154_nl_put_failure(struct sk_buff *msg) > +{ > + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ > + genlmsg_cancel(msg, hdr); > + nlmsg_free(msg); > + return -ENOBUFS; > +} This seems weird. > +int ieee802154_nl_assoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 cap) > +{ > + struct sk_buff *msg; > + > + pr_debug("%s\n", __func__); > + > + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_ASSOCIATE_INDIC); > + if (!msg) > + return -ENOBUFS; > + > + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); > + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); > + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_HW_ADDR, dev->dev_addr); > + > + /* FIXME: check that we really received hw address */ > + NLA_PUT_HW_ADDR(msg, IEEE802154_ATTR_SRC_HW_ADDR, addr->hwaddr); ? > +static int ieee802154_associate_req(struct sk_buff *skb, struct genl_info *info) > +{ > + struct net_device *dev; > + struct ieee802154_addr addr; > + int ret = -EINVAL; > + > + if (!info->attrs[IEEE802154_ATTR_CHANNEL] > + || !info->attrs[IEEE802154_ATTR_COORD_PAN_ID] > + || (!info->attrs[IEEE802154_ATTR_COORD_HW_ADDR] && !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]) > + || !info->attrs[IEEE802154_ATTR_CAPABILITY]) > + return -EINVAL; That's some odd coding style. johannes [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 801 bytes --] ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-03 11:05 ` Johannes Berg @ 2009-06-03 12:27 ` Dmitry Eremin-Solenikov 2009-06-04 14:12 ` Johannes Berg 2009-06-03 12:55 ` Sergey Lapin 2009-06-03 23:12 ` Dmitry Eremin-Solenikov 2 siblings, 1 reply; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 12:27 UTC (permalink / raw) To: Johannes Berg Cc: David Miller, linux-kernel, netdev, linux-wireless, sfr, slapin On Wed, Jun 03, 2009 at 01:05:10PM +0200, Johannes Berg wrote: > On Wed, 2009-06-03 at 14:52 +0400, Dmitry Eremin-Solenikov wrote: > > +#define IEEE802154_ATTR_MAX (__IEEE802154_ATTR_MAX - 1) > > +#define NLA_HW_ADDR NLA_U64 > > +#define NLA_GET_HW_ADDR(attr, addr) do { u64 _temp = nla_get_u64(attr); memcpy(addr, &_temp, 8); } while (0) > > +#define NLA_PUT_HW_ADDR(msg, attr, addr) do { u64 _temp; memcpy(&_temp, addr, 8); NLA_PUT_U64(msg, attr, _temp); } while (0) > > I really don't like this namespace pollution. > > > +#ifdef IEEE802154_NL_WANT_POLICY > > +static struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = { > > Ho humm. This shouldn't be in a header file. Not even with an #ifdef > that exactly one C file then sets. > > > + [IEEE802154_ATTR_DURATION] = { .type = NLA_U8, }, > > +#ifdef __KERNEL__ > > + [IEEE802154_ATTR_ED_LIST] = { .len = 27 }, > > +#else > > Ick. We'd like to share the policy declaration between kernel and user space as a single file. I'll move this from header to the source file though. > > > +/* commands */ > > +/* REQ should be responded with CONF > > + * and INDIC with RESP > > + */ > > +enum { > > kernel-doc explaining the commands would be immensely helpful. What explanations whould you like to see? These commands are described in the IEEE 802.15.4 standard. > > > > + IEEE802154_GTS_REQ, /* Not supported yet */ > > + IEEE802154_GTS_INDIC, /* Not supported yet */ > > + IEEE802154_GTS_CONF, /* Not supported yet */ > > + IEEE802154_RX_ENABLE_REQ, /* Not supported yet */ > > + IEEE802154_RX_ENABLE_CONF, /* Not supported yet */ > > Just leave it out then. You're fixing ABI here. Thas is the desired thing: the ABI is modelled after the subroutines in IEEE 802.15.4 standard. So we'd like to fix the numbers for the commands from the start. > > +#ifdef __KERNEL__ > > +struct net_device; > > + > > +int ieee802154_nl_assoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 cap); > > +int ieee802154_nl_assoc_confirm(struct net_device *dev, u16 short_addr, u8 status); > > +int ieee802154_nl_disassoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 reason); > > +int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status); > > +int ieee802154_nl_scan_confirm(struct net_device *dev, u8 status, u8 scan_type, u32 unscanned, > > + u8 *edl/*, struct list_head *pan_desc_list */); > > +int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid, u16 coord_addr); /* TODO */ > > +#endif > > Why not just use two header files, one in net/ and one in linux/? What would you suggest to put into the linux/ header and what in the net/ one? > > +static int ieee802154_nl_put_failure(struct sk_buff *msg) > > +{ > > + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ > > + genlmsg_cancel(msg, hdr); > > + nlmsg_free(msg); > > + return -ENOBUFS; > > +} > > This seems weird. Why? > > +static int ieee802154_associate_req(struct sk_buff *skb, struct genl_info *info) > > +{ > > + struct net_device *dev; > > + struct ieee802154_addr addr; > > + int ret = -EINVAL; > > + > > + if (!info->attrs[IEEE802154_ATTR_CHANNEL] > > + || !info->attrs[IEEE802154_ATTR_COORD_PAN_ID] > > + || (!info->attrs[IEEE802154_ATTR_COORD_HW_ADDR] && !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]) > > + || !info->attrs[IEEE802154_ATTR_CAPABILITY]) > > + return -EINVAL; > > That's some odd coding style. Could you please elaborate this? What seems odd to you? -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-03 12:27 ` Dmitry Eremin-Solenikov @ 2009-06-04 14:12 ` Johannes Berg 2009-06-04 14:51 ` Dmitry Eremin-Solenikov 0 siblings, 1 reply; 30+ messages in thread From: Johannes Berg @ 2009-06-04 14:12 UTC (permalink / raw) To: Dmitry Eremin-Solenikov Cc: David Miller, linux-kernel, netdev, linux-wireless, sfr, slapin [-- Attachment #1: Type: text/plain, Size: 2556 bytes --] On Wed, 2009-06-03 at 16:27 +0400, Dmitry Eremin-Solenikov wrote: > > > +/* commands */ > > > +/* REQ should be responded with CONF > > > + * and INDIC with RESP > > > + */ > > > +enum { > > > > kernel-doc explaining the commands would be immensely helpful. > > What explanations whould you like to see? These commands are described > in the IEEE 802.15.4 standard. Well, for example which arguments they require... > > > +#ifdef __KERNEL__ > > > +struct net_device; > > > + > > > +int ieee802154_nl_assoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 cap); > > > +int ieee802154_nl_assoc_confirm(struct net_device *dev, u16 short_addr, u8 status); > > > +int ieee802154_nl_disassoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 reason); > > > +int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status); > > > +int ieee802154_nl_scan_confirm(struct net_device *dev, u8 status, u8 scan_type, u32 unscanned, > > > + u8 *edl/*, struct list_head *pan_desc_list */); > > > +int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid, u16 coord_addr); /* TODO */ > > > +#endif > > > > Why not just use two header files, one in net/ and one in linux/? > > What would you suggest to put into the linux/ header and what in the > net/ one? userspace vs. in-kernel separation > > > +static int ieee802154_nl_put_failure(struct sk_buff *msg) > > > +{ > > > + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ > > > + genlmsg_cancel(msg, hdr); > > > + nlmsg_free(msg); > > > + return -ENOBUFS; > > > +} > > > > This seems weird. > > Why? Because it's strange to cancel then free? > > > +static int ieee802154_associate_req(struct sk_buff *skb, struct genl_info *info) > > > +{ > > > + struct net_device *dev; > > > + struct ieee802154_addr addr; > > > + int ret = -EINVAL; > > > + > > > + if (!info->attrs[IEEE802154_ATTR_CHANNEL] > > > + || !info->attrs[IEEE802154_ATTR_COORD_PAN_ID] > > > + || (!info->attrs[IEEE802154_ATTR_COORD_HW_ADDR] && !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]) > > > + || !info->attrs[IEEE802154_ATTR_CAPABILITY]) > > > + return -EINVAL; > > > > That's some odd coding style. > > Could you please elaborate this? What seems odd to you? if (X && Y) vs if (X && Y) where the latter is used for all other sources files in the kernel. Try applying that to _all_ your patches while you rework the sources to fit into 80 columns. johannes [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 801 bytes --] ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-04 14:12 ` Johannes Berg @ 2009-06-04 14:51 ` Dmitry Eremin-Solenikov 2009-06-04 15:12 ` Patrick McHardy 0 siblings, 1 reply; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-04 14:51 UTC (permalink / raw) To: Johannes Berg Cc: David Miller, linux-kernel, netdev, linux-wireless, sfr, slapin 2009/6/4 Johannes Berg <johannes@sipsolutions.net>: > On Wed, 2009-06-03 at 16:27 +0400, Dmitry Eremin-Solenikov wrote: > >> > > +static int ieee802154_nl_put_failure(struct sk_buff *msg) >> > > +{ >> > > + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ >> > > + genlmsg_cancel(msg, hdr); >> > > + nlmsg_free(msg); >> > > + return -ENOBUFS; >> > > +} >> > >> > This seems weird. >> >> Why? > > Because it's strange to cancel then free? >From looking at the other code, the usual pattern for netlink is (please, correct me if I'm wrong): int fill (....) { genlmsg_put(); NLA_PUT(...) NLA_PUT(...) return genlmsg_end(); nla_put_failure: genlmsg_cancel(); return -EMSGSIZE; } int cmd(...) { int rc; nlmsg_new(); rc = fill(); if (rc < 0) goto out; genlmsg_unicast(); out: nlmsg_free(); return -ENOBUFS; } This is equivalent to our code: sk_buff *new() { msg = nlmsg_new(); genlmsg_put(); return msg; } int finish() { genlmsg_end(); return genlmsg_unicast(); /*multicast in our case, but doesn't matter */ } int cancel() { genlmsg_cancel(); nlmsg_free(); return -ENOBUFS; } int cmd() { msg = new(); NLA_PUT() NLA_PUT(); return finish(); nla_put_failure: return cancel(); } >> > > +static int ieee802154_associate_req(struct sk_buff *skb, struct genl_info *info) >> > > +{ >> > > + struct net_device *dev; >> > > + struct ieee802154_addr addr; >> > > + int ret = -EINVAL; >> > > + >> > > + if (!info->attrs[IEEE802154_ATTR_CHANNEL] >> > > + || !info->attrs[IEEE802154_ATTR_COORD_PAN_ID] >> > > + || (!info->attrs[IEEE802154_ATTR_COORD_HW_ADDR] && !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]) >> > > + || !info->attrs[IEEE802154_ATTR_CAPABILITY]) >> > > + return -EINVAL; >> > >> > That's some odd coding style. >> >> Could you please elaborate this? What seems odd to you? > > if (X > && Y) > > vs > > if (X && > Y) > > where the latter is used for all other sources files in the kernel. Try > applying that to _all_ your patches while you rework the sources to fit > into 80 columns. Fine, I'll apply the latter pattern and try to reformat code to fit to 80 columns. -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-04 14:51 ` Dmitry Eremin-Solenikov @ 2009-06-04 15:12 ` Patrick McHardy 2009-06-04 15:14 ` Dmitry Eremin-Solenikov 0 siblings, 1 reply; 30+ messages in thread From: Patrick McHardy @ 2009-06-04 15:12 UTC (permalink / raw) To: Dmitry Eremin-Solenikov Cc: Johannes Berg, David Miller, linux-kernel, netdev, linux-wireless, sfr, slapin Dmitry Eremin-Solenikov wrote: > 2009/6/4 Johannes Berg <johannes@sipsolutions.net>: >> On Wed, 2009-06-03 at 16:27 +0400, Dmitry Eremin-Solenikov wrote: >> >>>>> +static int ieee802154_nl_put_failure(struct sk_buff *msg) >>>>> +{ >>>>> + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ >>>>> + genlmsg_cancel(msg, hdr); >>>>> + nlmsg_free(msg); >>>>> + return -ENOBUFS; >>>>> +} >>>> This seems weird. >>> Why? >> Because it's strange to cancel then free? > >>From looking at the other code, the usual pattern for netlink is > (please, correct me if I'm wrong): > > int fill (....) > { > genlmsg_put(); > NLA_PUT(...) > NLA_PUT(...) > return genlmsg_end(); > > nla_put_failure: > genlmsg_cancel(); > return -EMSGSIZE; > } > > int cmd(...) > { > int rc; > nlmsg_new(); > > rc = fill(); > if (rc < 0) > goto out; > > genlmsg_unicast(); > > out: > nlmsg_free(); > return -ENOBUFS; > } > > This is equivalent to our code: > > sk_buff *new() > { > msg = nlmsg_new(); > genlmsg_put(); > return msg; > } canceling messages is only necessary in fill functions that are also used for dumps, where as many elements are stuffed in the skb as possible. When the last element doesn't completely fit, its removed again (canceled) and put into the next skb. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-04 15:12 ` Patrick McHardy @ 2009-06-04 15:14 ` Dmitry Eremin-Solenikov 2009-06-04 15:15 ` Patrick McHardy 0 siblings, 1 reply; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-04 15:14 UTC (permalink / raw) To: Patrick McHardy Cc: Johannes Berg, David Miller, linux-kernel, netdev, linux-wireless, sfr, slapin 2009/6/4 Patrick McHardy <kaber@trash.net>: > Dmitry Eremin-Solenikov wrote: >> >> 2009/6/4 Johannes Berg <johannes@sipsolutions.net>: >>> >>> On Wed, 2009-06-03 at 16:27 +0400, Dmitry Eremin-Solenikov wrote: >>> >>>>>> +static int ieee802154_nl_put_failure(struct sk_buff *msg) >>>>>> +{ >>>>>> + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is >>>>>> right at the start of msg */ >>>>>> + genlmsg_cancel(msg, hdr); >>>>>> + nlmsg_free(msg); >>>>>> + return -ENOBUFS; >>>>>> +} >>>>> >>>>> This seems weird. >>>> >>>> Why? >>> >>> Because it's strange to cancel then free? >> >>> From looking at the other code, the usual pattern for netlink is >> >> (please, correct me if I'm wrong): >> >> int fill (....) >> { >> genlmsg_put(); >> NLA_PUT(...) >> NLA_PUT(...) >> return genlmsg_end(); >> >> nla_put_failure: >> genlmsg_cancel(); >> return -EMSGSIZE; >> } >> >> int cmd(...) >> { >> int rc; >> nlmsg_new(); >> >> rc = fill(); >> if (rc < 0) >> goto out; >> >> genlmsg_unicast(); >> >> out: >> nlmsg_free(); >> return -ENOBUFS; >> } >> >> This is equivalent to our code: >> >> sk_buff *new() >> { >> msg = nlmsg_new(); >> genlmsg_put(); >> return msg; >> } > > canceling messages is only necessary in fill functions that are > also used for dumps, where as many elements are stuffed in the > skb as possible. When the last element doesn't completely fit, > its removed again (canceled) and put into the next skb. Understood. So you'd suggest just to drop the genlmsg_cancel() from the failure call chain? -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-04 15:14 ` Dmitry Eremin-Solenikov @ 2009-06-04 15:15 ` Patrick McHardy 0 siblings, 0 replies; 30+ messages in thread From: Patrick McHardy @ 2009-06-04 15:15 UTC (permalink / raw) To: Dmitry Eremin-Solenikov Cc: Johannes Berg, David Miller, linux-kernel, netdev, linux-wireless, sfr, slapin Dmitry Eremin-Solenikov wrote: > 2009/6/4 Patrick McHardy <kaber@trash.net>: >> canceling messages is only necessary in fill functions that are >> also used for dumps, where as many elements are stuffed in the >> skb as possible. When the last element doesn't completely fit, >> its removed again (canceled) and put into the next skb. > > Understood. So you'd suggest just to drop the genlmsg_cancel() > from the failure call chain? Yes. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-03 11:05 ` Johannes Berg 2009-06-03 12:27 ` Dmitry Eremin-Solenikov @ 2009-06-03 12:55 ` Sergey Lapin 2009-06-03 14:21 ` Patrick McHardy 2009-06-03 23:12 ` Dmitry Eremin-Solenikov 2 siblings, 1 reply; 30+ messages in thread From: Sergey Lapin @ 2009-06-03 12:55 UTC (permalink / raw) To: Johannes Berg Cc: Dmitry Eremin-Solenikov, David Miller, linux-kernel, netdev, linux-wireless, sfr > > +#define IEEE802154_ATTR_MAX (__IEEE802154_ATTR_MAX - 1) > > +#define NLA_HW_ADDR NLA_U64 > > +#define NLA_GET_HW_ADDR(attr, addr) do { u64 _temp = nla_get_u64(attr); memcpy(addr, &_temp, 8); } while (0) > > +#define NLA_PUT_HW_ADDR(msg, attr, addr) do { u64 _temp; memcpy(&_temp, addr, 8); NLA_PUT_U64(msg, attr, _temp); } while (0) What would you propose here? adding prefix will add length to macro, IEEE802154_NL_PUT_HW_ADDR is damn long name. Using repeated code sequence is not better (it is error-prone and unreadable). Any ideas? ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-03 12:55 ` Sergey Lapin @ 2009-06-03 14:21 ` Patrick McHardy 0 siblings, 0 replies; 30+ messages in thread From: Patrick McHardy @ 2009-06-03 14:21 UTC (permalink / raw) To: Sergey Lapin Cc: Johannes Berg, Dmitry Eremin-Solenikov, David Miller, linux-kernel, netdev, linux-wireless, sfr Sergey Lapin wrote: >>> +#define IEEE802154_ATTR_MAX (__IEEE802154_ATTR_MAX - 1) >>> +#define NLA_HW_ADDR NLA_U64 >>> +#define NLA_GET_HW_ADDR(attr, addr) do { u64 _temp = nla_get_u64(attr); memcpy(addr, &_temp, 8); } while (0) >>> +#define NLA_PUT_HW_ADDR(msg, attr, addr) do { u64 _temp; memcpy(&_temp, addr, 8); NLA_PUT_U64(msg, attr, _temp); } while (0) > > What would you propose here? adding prefix will add length to macro, > IEEE802154_NL_PUT_HW_ADDR is damn long name. Using repeated code > sequence is not better (it is error-prone and unreadable). > > Any ideas? Kill it and use nla_put(skb, attr, addr, 8); ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices 2009-06-03 11:05 ` Johannes Berg 2009-06-03 12:27 ` Dmitry Eremin-Solenikov 2009-06-03 12:55 ` Sergey Lapin @ 2009-06-03 23:12 ` Dmitry Eremin-Solenikov 2 siblings, 0 replies; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 23:12 UTC (permalink / raw) To: Johannes Berg Cc: David Miller, linux-kernel, netdev, linux-wireless, sfr, slapin Hi, This doesn't address all the comments all comments by Johannes (as I didn't understood the two last one), but I'd like to post this heavily updated version. >From 1aae1d7a60b104d271082c7612d1b9b9314c5949 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Date: Thu, 4 Jun 2009 03:09:42 +0400 Subject: [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices Add a netlink interface for configuration of IEEE 802.15.4 device. Also this interface specifies events notification sent by devices towards higher layers. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Sergey Lapin <slapin@ossfans.org> --- include/net/ieee802154/nl802154.h | 137 +++++++++++ net/ieee802154/Makefile | 3 +- net/ieee802154/netlink.c | 489 +++++++++++++++++++++++++++++++++++++ net/ieee802154/nl_policy.c | 65 +++++ 4 files changed, 693 insertions(+), 1 deletions(-) create mode 100644 include/net/ieee802154/nl802154.h create mode 100644 net/ieee802154/netlink.c create mode 100644 net/ieee802154/nl_policy.c diff --git a/include/net/ieee802154/nl802154.h b/include/net/ieee802154/nl802154.h new file mode 100644 index 0000000..0b03979 --- /dev/null +++ b/include/net/ieee802154/nl802154.h @@ -0,0 +1,137 @@ +/* + * nl802154.h + * + * Copyright (C) 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#ifndef IEEE802154_NL_H +#define IEEE802154_NL_H + +#ifdef __KERNEL__ +#include <net/netlink.h> +#endif + +#define IEEE802154_NL_NAME "802.15.4 MAC" +#define IEEE802154_MCAST_COORD_NAME "coordinator" +#define IEEE802154_MCAST_BEACON_NAME "beacon" + +enum { + __IEEE802154_ATTR_INVALID, + + IEEE802154_ATTR_DEV_NAME, + IEEE802154_ATTR_DEV_INDEX, + + IEEE802154_ATTR_STATUS, + + IEEE802154_ATTR_SHORT_ADDR, + IEEE802154_ATTR_HW_ADDR, + IEEE802154_ATTR_PAN_ID, + + IEEE802154_ATTR_CHANNEL, + + IEEE802154_ATTR_COORD_SHORT_ADDR, + IEEE802154_ATTR_COORD_HW_ADDR, + IEEE802154_ATTR_COORD_PAN_ID, + + IEEE802154_ATTR_SRC_SHORT_ADDR, + IEEE802154_ATTR_SRC_HW_ADDR, + IEEE802154_ATTR_SRC_PAN_ID, + + IEEE802154_ATTR_DEST_SHORT_ADDR, + IEEE802154_ATTR_DEST_HW_ADDR, + IEEE802154_ATTR_DEST_PAN_ID, + + IEEE802154_ATTR_CAPABILITY, + IEEE802154_ATTR_REASON, + IEEE802154_ATTR_SCAN_TYPE, + IEEE802154_ATTR_CHANNELS, + IEEE802154_ATTR_DURATION, + IEEE802154_ATTR_ED_LIST, + IEEE802154_ATTR_BCN_ORD, + IEEE802154_ATTR_SF_ORD, + IEEE802154_ATTR_PAN_COORD, + IEEE802154_ATTR_BAT_EXT, + IEEE802154_ATTR_COORD_REALIGN, + IEEE802154_ATTR_SEC, + + __IEEE802154_ATTR_MAX, +}; + +#define IEEE802154_ATTR_MAX (__IEEE802154_ATTR_MAX - 1) + +extern struct nla_policy ieee802154_policy[]; + +/* commands */ +/* REQ should be responded with CONF + * and INDIC with RESP + */ +enum { + __IEEE802154_COMMAND_INVALID, + + IEEE802154_ASSOCIATE_REQ, + IEEE802154_ASSOCIATE_CONF, + IEEE802154_DISASSOCIATE_REQ, + IEEE802154_DISASSOCIATE_CONF, + IEEE802154_GET_REQ, + IEEE802154_GET_CONF, + IEEE802154_RESET_REQ, + IEEE802154_RESET_CONF, + IEEE802154_SCAN_REQ, + IEEE802154_SCAN_CONF, + IEEE802154_SET_REQ, + IEEE802154_SET_CONF, + IEEE802154_START_REQ, + IEEE802154_START_CONF, + IEEE802154_SYNC_REQ, + IEEE802154_POLL_REQ, + IEEE802154_POLL_CONF, + + IEEE802154_ASSOCIATE_INDIC, + IEEE802154_ASSOCIATE_RESP, + IEEE802154_DISASSOCIATE_INDIC, + IEEE802154_BEACON_NOTIFY_INDIC, + IEEE802154_ORPHAN_INDIC, + IEEE802154_ORPHAN_RESP, + IEEE802154_COMM_STATUS_INDIC, + IEEE802154_SYNC_LOSS_INDIC, + + IEEE802154_GTS_REQ, /* Not supported yet */ + IEEE802154_GTS_INDIC, /* Not supported yet */ + IEEE802154_GTS_CONF, /* Not supported yet */ + IEEE802154_RX_ENABLE_REQ, /* Not supported yet */ + IEEE802154_RX_ENABLE_CONF, /* Not supported yet */ + + __IEEE802154_CMD_MAX, +}; + +#define IEEE802154_CMD_MAX (__IEEE802154_CMD_MAX - 1) + + +#ifdef __KERNEL__ +struct net_device; +struct ieee802154_addr; + +int ieee802154_nl_assoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 cap); +int ieee802154_nl_assoc_confirm(struct net_device *dev, u16 short_addr, u8 status); +int ieee802154_nl_disassoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 reason); +int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status); +int ieee802154_nl_scan_confirm(struct net_device *dev, u8 status, u8 scan_type, u32 unscanned, + u8 *edl/*, struct list_head *pan_desc_list */); +int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid, u16 coord_addr); /* TODO */ +#endif + +#endif diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile index cb88054..0b11995 100644 --- a/net/ieee802154/Makefile +++ b/net/ieee802154/Makefile @@ -1,4 +1,5 @@ -obj-$(CONFIG_IEEE802154) += af_802154.o +obj-$(CONFIG_IEEE802154) += nl802154.o af_802154.o +nl802154-objs := netlink.o nl_policy.o af_802154-objs := af_ieee802154.o raw.o dgram.o EXTRA_CFLAGS += -Wall -DDEBUG diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c new file mode 100644 index 0000000..6163db6 --- /dev/null +++ b/net/ieee802154/netlink.c @@ -0,0 +1,489 @@ +/* + * Netlink inteface for IEEE 802.15.4 stack + * + * Copyright 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Sergey Lapin <sergey.lapin@siemens.com> + * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> + */ + +#include <linux/kernel.h> +#include <linux/if_arp.h> +#include <net/netlink.h> +#include <net/genetlink.h> +#include <linux/netdevice.h> +#include <net/ieee802154/af_ieee802154.h> +#define IEEE802154_NL_WANT_POLICY +#include <net/ieee802154/nl802154.h> +#include <net/ieee802154/netdevice.h> + +static unsigned int ieee802154_seq_num; + +static struct genl_family ieee802154_coordinator_family = { + .id = GENL_ID_GENERATE, + .hdrsize = 0, + .name = IEEE802154_NL_NAME, + .version = 1, + .maxattr = IEEE802154_ATTR_MAX, +}; + +static struct genl_multicast_group ieee802154_coord_mcgrp = { + .name = IEEE802154_MCAST_COORD_NAME, +}; + +static struct genl_multicast_group ieee802154_beacon_mcgrp = { + .name = IEEE802154_MCAST_BEACON_NAME, +}; + +/* Requests to userspace */ +static struct sk_buff *ieee802154_nl_create(int flags, u8 req) +{ + void *hdr; + struct sk_buff *msg = nlmsg_new(NLMSG_GOODSIZE, GFP_ATOMIC); + + if (!msg) + return NULL; + + hdr = genlmsg_put(msg, 0, ieee802154_seq_num++, &ieee802154_coordinator_family, flags, req); + if (!hdr) { + nlmsg_free(msg); + return NULL; + } + + return msg; +} + +static int ieee802154_nl_finish(struct sk_buff *msg) +{ + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ + + if (!genlmsg_end(msg, hdr)) + goto out; + + return genlmsg_multicast(msg, 0, ieee802154_coord_mcgrp.id, GFP_ATOMIC); +out: + nlmsg_free(msg); + return -ENOBUFS; +} + +static int ieee802154_nl_put_failure(struct sk_buff *msg) +{ + void *hdr = genlmsg_data(NLMSG_DATA(msg->data)); /* XXX: nlh is right at the start of msg */ + genlmsg_cancel(msg, hdr); + nlmsg_free(msg); + return -ENOBUFS; +} + +int ieee802154_nl_assoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 cap) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + if (addr->addr_type != IEEE802154_ADDR_LONG) { + pr_err("%s: received non-long source address!\n", __func__); + return -EINVAL; + } + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_ASSOCIATE_INDIC); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN, dev->dev_addr); + + NLA_PUT(msg, IEEE802154_ATTR_SRC_HW_ADDR, IEEE802154_ADDR_LEN, addr->hwaddr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_CAPABILITY, cap); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_assoc_indic); + +int ieee802154_nl_assoc_confirm(struct net_device *dev, u16 short_addr, u8 status) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_ASSOCIATE_CONF); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN, dev->dev_addr); + + NLA_PUT_U16(msg, IEEE802154_ATTR_SHORT_ADDR, short_addr); + NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_assoc_confirm); + +int ieee802154_nl_disassoc_indic(struct net_device *dev, struct ieee802154_addr *addr, u8 reason) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_DISASSOCIATE_INDIC); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN, dev->dev_addr); + + if (addr->addr_type == IEEE802154_ADDR_LONG) + NLA_PUT(msg, IEEE802154_ATTR_SRC_HW_ADDR, IEEE802154_ADDR_LEN, addr->hwaddr); + else + NLA_PUT_U16(msg, IEEE802154_ATTR_SRC_SHORT_ADDR, addr->short_addr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_REASON, reason); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_disassoc_indic); + +int ieee802154_nl_disassoc_confirm(struct net_device *dev, u8 status) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_DISASSOCIATE_CONF); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN, dev->dev_addr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_disassoc_confirm); + +int ieee802154_nl_beacon_indic(struct net_device *dev, u16 panid, u16 coord_addr) /* TODO */ +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_BEACON_NOTIFY_INDIC); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN, dev->dev_addr); + NLA_PUT_U16(msg, IEEE802154_ATTR_COORD_SHORT_ADDR, coord_addr); + NLA_PUT_U16(msg, IEEE802154_ATTR_COORD_PAN_ID, panid); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_beacon_indic); + +int ieee802154_nl_scan_confirm(struct net_device *dev, u8 status, u8 scan_type, u32 unscanned, + u8 *edl/* , struct list_head *pan_desc_list */) +{ + struct sk_buff *msg; + + pr_debug("%s\n", __func__); + + msg = ieee802154_nl_create(/* flags*/ 0, IEEE802154_SCAN_CONF); + if (!msg) + return -ENOBUFS; + + NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, dev->name); + NLA_PUT_U32(msg, IEEE802154_ATTR_DEV_INDEX, dev->ifindex); + NLA_PUT(msg, IEEE802154_ATTR_HW_ADDR, IEEE802154_ADDR_LEN, dev->dev_addr); + + NLA_PUT_U8(msg, IEEE802154_ATTR_STATUS, status); + NLA_PUT_U8(msg, IEEE802154_ATTR_SCAN_TYPE, scan_type); + NLA_PUT_U32(msg, IEEE802154_ATTR_CHANNELS, unscanned); + + if (edl) + NLA_PUT(msg, IEEE802154_ATTR_ED_LIST, 27, edl); + + return ieee802154_nl_finish(msg); + +nla_put_failure: + return ieee802154_nl_put_failure(msg); +} +EXPORT_SYMBOL(ieee802154_nl_scan_confirm); + +/* Requests from userspace */ +static struct net_device *ieee802154_nl_get_dev(struct genl_info *info) +{ + struct net_device *dev; + + if (info->attrs[IEEE802154_ATTR_DEV_NAME]) { + char name[IFNAMSIZ + 1]; + nla_strlcpy(name, info->attrs[IEEE802154_ATTR_DEV_NAME], sizeof(name)); + dev = dev_get_by_name(&init_net, name); + } else if (info->attrs[IEEE802154_ATTR_DEV_INDEX]) + dev = dev_get_by_index(&init_net, nla_get_u32(info->attrs[IEEE802154_ATTR_DEV_INDEX])); + else + return NULL; + + if (dev->type != ARPHRD_IEEE802154) { + dev_put(dev); + return NULL; + } + + return dev; +} + +static int ieee802154_associate_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + int ret = -EINVAL; + + if (!info->attrs[IEEE802154_ATTR_CHANNEL] + || !info->attrs[IEEE802154_ATTR_COORD_PAN_ID] + || (!info->attrs[IEEE802154_ATTR_COORD_HW_ADDR] && !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]) + || !info->attrs[IEEE802154_ATTR_CAPABILITY]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + if (info->attrs[IEEE802154_ATTR_COORD_HW_ADDR]) { + addr.addr_type = IEEE802154_ADDR_LONG; + nla_memcpy(addr.hwaddr, info->attrs[IEEE802154_ATTR_COORD_HW_ADDR], IEEE802154_ADDR_LEN); + } else { + addr.addr_type = IEEE802154_ADDR_SHORT; + addr.short_addr = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]); + } + addr.pan_id = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_PAN_ID]); + + ret = IEEE802154_MLME_OPS(dev)->assoc_req(dev, &addr, + nla_get_u8(info->attrs[IEEE802154_ATTR_CHANNEL]), + nla_get_u8(info->attrs[IEEE802154_ATTR_CAPABILITY])); + + dev_put(dev); + return ret; +} + +static int ieee802154_associate_resp(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + int ret = -EINVAL; + + if (!info->attrs[IEEE802154_ATTR_STATUS] + || !info->attrs[IEEE802154_ATTR_DEST_HW_ADDR] + || !info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + addr.addr_type = IEEE802154_ADDR_LONG; + nla_memcpy(addr.hwaddr, info->attrs[IEEE802154_ATTR_DEST_HW_ADDR], IEEE802154_ADDR_LEN); + addr.pan_id = IEEE802154_MLME_OPS(dev)->get_pan_id(dev); + + + ret = IEEE802154_MLME_OPS(dev)->assoc_resp(dev, &addr, + nla_get_u16(info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]), + nla_get_u8(info->attrs[IEEE802154_ATTR_STATUS])); + + dev_put(dev); + return ret; +} + +static int ieee802154_disassociate_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + int ret = -EINVAL; + + if ((!info->attrs[IEEE802154_ATTR_DEST_HW_ADDR] && !info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]) + || !info->attrs[IEEE802154_ATTR_REASON]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + if (info->attrs[IEEE802154_ATTR_DEST_HW_ADDR]) { + addr.addr_type = IEEE802154_ADDR_LONG; + nla_memcpy(addr.hwaddr, info->attrs[IEEE802154_ATTR_DEST_HW_ADDR], IEEE802154_ADDR_LEN); + } else { + addr.addr_type = IEEE802154_ADDR_SHORT; + addr.short_addr = nla_get_u16(info->attrs[IEEE802154_ATTR_DEST_SHORT_ADDR]); + } + addr.pan_id = IEEE802154_MLME_OPS(dev)->get_pan_id(dev); + + ret = IEEE802154_MLME_OPS(dev)->disassoc_req(dev, &addr, + nla_get_u8(info->attrs[IEEE802154_ATTR_REASON])); + + dev_put(dev); + return ret; +} + +/* + * PANid, channel, beacon_order = 15, superframe_order = 15, + * PAN_coordinator, battery_life_extension = 0, + * coord_realignment = 0, security_enable = 0 +*/ +static int ieee802154_start_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + struct ieee802154_addr addr; + + u8 channel, bcn_ord, sf_ord; + int pan_coord, blx, coord_realign; + int ret; + + if (!info->attrs[IEEE802154_ATTR_COORD_PAN_ID] + || !info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR] + || !info->attrs[IEEE802154_ATTR_CHANNEL] + || !info->attrs[IEEE802154_ATTR_BCN_ORD] + || !info->attrs[IEEE802154_ATTR_SF_ORD] + || !info->attrs[IEEE802154_ATTR_PAN_COORD] + || !info->attrs[IEEE802154_ATTR_BAT_EXT] + || !info->attrs[IEEE802154_ATTR_COORD_REALIGN] + ) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + addr.addr_type = IEEE802154_ADDR_SHORT; + addr.short_addr = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_SHORT_ADDR]); + addr.pan_id = nla_get_u16(info->attrs[IEEE802154_ATTR_COORD_PAN_ID]); + + channel = nla_get_u8(info->attrs[IEEE802154_ATTR_CHANNEL]); + bcn_ord = nla_get_u8(info->attrs[IEEE802154_ATTR_BCN_ORD]); + sf_ord = nla_get_u8(info->attrs[IEEE802154_ATTR_SF_ORD]); + pan_coord = nla_get_u8(info->attrs[IEEE802154_ATTR_PAN_COORD]); + blx = nla_get_u8(info->attrs[IEEE802154_ATTR_BAT_EXT]); + coord_realign = nla_get_u8(info->attrs[IEEE802154_ATTR_COORD_REALIGN]); + + ret = IEEE802154_MLME_OPS(dev)->start_req(dev, &addr, channel, bcn_ord, sf_ord, + pan_coord, blx, coord_realign); + + dev_put(dev); + return ret; +} + +static int ieee802154_scan_req(struct sk_buff *skb, struct genl_info *info) +{ + struct net_device *dev; + int ret; + u8 type; + u32 channels; + u8 duration; + + if (!info->attrs[IEEE802154_ATTR_SCAN_TYPE] + || !info->attrs[IEEE802154_ATTR_CHANNELS] + || !info->attrs[IEEE802154_ATTR_DURATION]) + return -EINVAL; + + dev = ieee802154_nl_get_dev(info); + if (!dev) + return -ENODEV; + + type = nla_get_u8(info->attrs[IEEE802154_ATTR_SCAN_TYPE]); + channels = nla_get_u32(info->attrs[IEEE802154_ATTR_CHANNELS]); + duration = nla_get_u8(info->attrs[IEEE802154_ATTR_DURATION]); + + ret = IEEE802154_MLME_OPS(dev)->scan_req(dev, type, channels, duration); + + dev_put(dev); + return ret; +} + +#define IEEE802154_OP(_cmd, _func) \ + { \ + .cmd = _cmd, \ + .policy = ieee802154_policy, \ + .doit = _func, \ + .dumpit = NULL, \ + .flags = GENL_ADMIN_PERM, \ + } + +static struct genl_ops ieee802154_coordinator_ops[] = { + IEEE802154_OP(IEEE802154_ASSOCIATE_REQ, ieee802154_associate_req), + IEEE802154_OP(IEEE802154_ASSOCIATE_RESP, ieee802154_associate_resp), + IEEE802154_OP(IEEE802154_DISASSOCIATE_REQ, ieee802154_disassociate_req), + IEEE802154_OP(IEEE802154_SCAN_REQ, ieee802154_scan_req), + IEEE802154_OP(IEEE802154_START_REQ, ieee802154_start_req), +}; + +static int __init ieee802154_nl_init(void) +{ + int rc; + int i; + + rc = genl_register_family(&ieee802154_coordinator_family); + if (rc) + goto fail; + + rc = genl_register_mc_group(&ieee802154_coordinator_family, &ieee802154_coord_mcgrp); + if (rc) + goto fail; + + rc = genl_register_mc_group(&ieee802154_coordinator_family, &ieee802154_beacon_mcgrp); + if (rc) + goto fail; + + + for (i = 0; i < ARRAY_SIZE(ieee802154_coordinator_ops); i++) { + rc = genl_register_ops(&ieee802154_coordinator_family, &ieee802154_coordinator_ops[i]); + if (rc) + goto fail; + } + + return 0; + +fail: + genl_unregister_family(&ieee802154_coordinator_family); + return rc; +} +module_init(ieee802154_nl_init); + +static void __exit ieee802154_nl_exit(void) +{ + genl_unregister_family(&ieee802154_coordinator_family); +} +module_exit(ieee802154_nl_exit); + diff --git a/net/ieee802154/nl_policy.c b/net/ieee802154/nl_policy.c new file mode 100644 index 0000000..099e965 --- /dev/null +++ b/net/ieee802154/nl_policy.c @@ -0,0 +1,65 @@ +/* + * nl802154.h + * + * Copyright (C) 2007, 2008 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +/* This source file is shared between kernel and userspace sources, thus + * a bit of __KERNEL__ checks + */ +#ifdef __KERNEL__ +#include <linux/kernel.h> +#include <net/netlink.h> +#include <net/ieee802154/nl802154.h> +#else +#include <netlink/netlink.h> +#include <netlink/attr.h> +#include <nl802154.h> +#endif + +#define NLA_HW_ADDR NLA_U64 + +struct nla_policy ieee802154_policy[IEEE802154_ATTR_MAX + 1] = { + [IEEE802154_ATTR_DEV_NAME] = { .type = NLA_STRING, }, + [IEEE802154_ATTR_DEV_INDEX] = { .type = NLA_U32, }, + + [IEEE802154_ATTR_STATUS] = { .type = NLA_U8, }, + [IEEE802154_ATTR_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_PAN_ID] = { .type = NLA_U16, }, + [IEEE802154_ATTR_CHANNEL] = { .type = NLA_U8, }, + [IEEE802154_ATTR_COORD_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_COORD_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_COORD_PAN_ID] = { .type = NLA_U16, }, + [IEEE802154_ATTR_SRC_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_SRC_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_SRC_PAN_ID] = { .type = NLA_U16, }, + [IEEE802154_ATTR_DEST_SHORT_ADDR] = { .type = NLA_U16, }, + [IEEE802154_ATTR_DEST_HW_ADDR] = { .type = NLA_HW_ADDR, }, + [IEEE802154_ATTR_DEST_PAN_ID] = { .type = NLA_U16, }, + + [IEEE802154_ATTR_CAPABILITY] = { .type = NLA_U8, }, + [IEEE802154_ATTR_REASON] = { .type = NLA_U8, }, + [IEEE802154_ATTR_SCAN_TYPE] = { .type = NLA_U8, }, + [IEEE802154_ATTR_CHANNELS] = { .type = NLA_U32, }, + [IEEE802154_ATTR_DURATION] = { .type = NLA_U8, }, +#ifdef __KERNEL__ + [IEEE802154_ATTR_ED_LIST] = { .len = 27 }, +#else + [IEEE802154_ATTR_ED_LIST] = { .minlen = 27, .maxlen = 27 }, +#endif +}; -- 1.6.3.1 -- With best wishes Dmitry ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack 2009-06-03 9:33 ` [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 3/6] net: add IEEE 802.15.4 socket family implementation Dmitry Eremin-Solenikov @ 2009-06-03 10:08 ` David Miller 2009-06-03 10:51 ` Dmitry Eremin-Solenikov 1 sibling, 1 reply; 30+ messages in thread From: David Miller @ 2009-06-03 10:08 UTC (permalink / raw) To: dbaryshkov; +Cc: linux-kernel, netdev, linux-wireless, sfr, slapin From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> 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 <dbaryshkov@gmail.com> > Signed-off-by: Sergey Lapin <slapin@ossfans.org> > --- > 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. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack 2009-06-03 10:08 ` [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack David Miller @ 2009-06-03 10:51 ` Dmitry Eremin-Solenikov 2009-06-03 21:19 ` David Miller 0 siblings, 1 reply; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 10:51 UTC (permalink / raw) To: David Miller; +Cc: linux-kernel, netdev, linux-wireless, sfr, slapin On Wed, Jun 03, 2009 at 03:08:26AM -0700, David Miller wrote: > From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> > 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 <dbaryshkov@gmail.com> > > Signed-off-by: Sergey Lapin <slapin@ossfans.org> > > --- > > 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 <dbaryshkov@gmail.com> 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 <dbaryshkov@gmail.com> Signed-off-by: Sergey Lapin <slapin@ossfans.org> --- 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" }; -- 1.6.3.1 -- With best wishes Dmitry ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack 2009-06-03 10:51 ` Dmitry Eremin-Solenikov @ 2009-06-03 21:19 ` David Miller 2009-06-03 23:15 ` Dmitry Eremin-Solenikov 0 siblings, 1 reply; 30+ messages in thread From: David Miller @ 2009-06-03 21:19 UTC (permalink / raw) To: dbaryshkov; +Cc: linux-kernel, netdev, linux-wireless, sfr, slapin From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Date: Wed, 3 Jun 2009 14:51:51 +0400 > 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. I don't allow anyone else to do this, and neither will I allow it for you either. Merge it when the patches that use them are submitted. And if it happens, you just might to change AF_ZIGBEE if that number is taken by another series of patches, that's just how it is. We don't reserve AF_* for people while they're getting their stuff ready. This decision is final. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack 2009-06-03 21:19 ` David Miller @ 2009-06-03 23:15 ` Dmitry Eremin-Solenikov 2009-06-04 0:49 ` David Miller 0 siblings, 1 reply; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 23:15 UTC (permalink / raw) To: David Miller; +Cc: linux-kernel, netdev, linux-wireless, sfr, slapin On Wed, Jun 03, 2009 at 02:19:19PM -0700, David Miller wrote: > From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> > Date: Wed, 3 Jun 2009 14:51:51 +0400 > > > 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. > > I don't allow anyone else to do this, and neither will I > allow it for you either. Sorry, we didn't know about this policy. No need to be that harsh! Here is the cleaned up version. >From d1e359b7f66a4acc8b41bbeaeeeee4c81501e4bc Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Date: Thu, 4 Jun 2009 03:09:40 +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 <dbaryshkov@gmail.com> Signed-off-by: Sergey Lapin <slapin@ossfans.org> --- include/linux/if_arp.h | 2 ++ include/linux/if_ether.h | 1 + include/linux/socket.h | 4 +++- net/core/dev.c | 6 ++++-- net/core/sock.c | 3 +++ 5 files changed, 13 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..11a60e4 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -106,6 +106,7 @@ #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 */ /* * This is an Ethernet frame header. diff --git a/include/linux/socket.h b/include/linux/socket.h index 421afb4..642d1f1 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -194,7 +194,8 @@ 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_MAX 37 /* For now.. */ /* Protocol families, same as address families. */ #define PF_UNSPEC AF_UNSPEC @@ -233,6 +234,7 @@ struct ucred { #define PF_RXRPC AF_RXRPC #define PF_ISDN AF_ISDN #define PF_PHONET AF_PHONET +#define PF_IEEE802154 AF_IEEE802154 #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..8a1644c 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_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_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_MAX" }; -- 1.6.3.1 -- With best wishes Dmitry ^ permalink raw reply related [flat|nested] 30+ messages in thread
* Re: [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack 2009-06-03 23:15 ` Dmitry Eremin-Solenikov @ 2009-06-04 0:49 ` David Miller 0 siblings, 0 replies; 30+ messages in thread From: David Miller @ 2009-06-04 0:49 UTC (permalink / raw) To: dbaryshkov; +Cc: linux-kernel, netdev, linux-wireless, sfr, slapin From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Date: Thu, 4 Jun 2009 03:15:37 +0400 > From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> > Date: Thu, 4 Jun 2009 03:09:40 +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 <dbaryshkov@gmail.com> > Signed-off-by: Sergey Lapin <slapin@ossfans.org> Looks a lot better, except that there is no reason to mention ZigBee anymore in the commit message I guess :-) Once all the feedback is sorted out, please make a formal resubmission of the entire series. Thank you. ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 1/6] crc-itu-t: add bit-reversed calculation 2009-06-03 9:33 ` [PATCH 1/6] crc-itu-t: add bit-reversed calculation Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack Dmitry Eremin-Solenikov @ 2009-06-03 12:43 ` Ben Hutchings 2009-06-03 12:48 ` Dmitry Eremin-Solenikov ` (2 more replies) 1 sibling, 3 replies; 30+ messages in thread From: Ben Hutchings @ 2009-06-03 12:43 UTC (permalink / raw) To: Dmitry Eremin-Solenikov Cc: linux-kernel, netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Darren Salt [-- Attachment #1: Type: text/plain, Size: 603 bytes --] On Wed, 2009-06-03 at 13:33 +0400, Dmitry Eremin-Solenikov wrote: [...] > +/** > + * crc_itu_t_bitreversed - Compute the CRC-ITU-T for the data buffer; > + * the buffer content is assumed to be bit-reversed [...] This short description spills onto two lines which is invalid and breaks the generation of docs. Sorry to point this out after recommending the patch to you. I've changed the description to "crc_itu_t_bitreversed - Compute the CRC-ITU-T for a bit-reversed data buffer" all on one line. Ben. -- Ben Hutchings Logic doesn't apply to the real world. - Marvin Minsky [-- Attachment #2: This is a digitally signed message part --] [-- Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 1/6] crc-itu-t: add bit-reversed calculation 2009-06-03 12:43 ` [PATCH 1/6] crc-itu-t: add bit-reversed calculation Ben Hutchings @ 2009-06-03 12:48 ` Dmitry Eremin-Solenikov 2009-06-04 0:49 ` Dmitry Eremin-Solenikov 2009-06-21 8:29 ` Dmitry Eremin-Solenikov 2 siblings, 0 replies; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-03 12:48 UTC (permalink / raw) To: Ben Hutchings Cc: linux-kernel, netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Darren Salt 2009/6/3 Ben Hutchings <ben@decadent.org.uk>: > On Wed, 2009-06-03 at 13:33 +0400, Dmitry Eremin-Solenikov wrote: > [...] >> +/** >> + * crc_itu_t_bitreversed - Compute the CRC-ITU-T for the data buffer; >> + * the buffer content is assumed to be bit-reversed > [...] > > This short description spills onto two lines which is invalid and breaks > the generation of docs. Sorry to point this out after recommending the > patch to you. > > I've changed the description to "crc_itu_t_bitreversed - Compute the > CRC-ITU-T for a bit-reversed data buffer" all on one line. Changing patch here in accordance with your suggestion. -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 1/6] crc-itu-t: add bit-reversed calculation 2009-06-03 12:43 ` [PATCH 1/6] crc-itu-t: add bit-reversed calculation Ben Hutchings 2009-06-03 12:48 ` Dmitry Eremin-Solenikov @ 2009-06-04 0:49 ` Dmitry Eremin-Solenikov 2009-06-21 8:29 ` Dmitry Eremin-Solenikov 2 siblings, 0 replies; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-04 0:49 UTC (permalink / raw) To: Ben Hutchings Cc: linux-kernel, netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Darren Salt On Wed, Jun 03, 2009 at 01:43:24PM +0100, Ben Hutchings wrote: > On Wed, 2009-06-03 at 13:33 +0400, Dmitry Eremin-Solenikov wrote: > [...] > > +/** > > + * crc_itu_t_bitreversed - Compute the CRC-ITU-T for the data buffer; > > + * the buffer content is assumed to be bit-reversed > [...] > > This short description spills onto two lines which is invalid and breaks > the generation of docs. Sorry to point this out after recommending the > patch to you. > > I've changed the description to "crc_itu_t_bitreversed - Compute the > CRC-ITU-T for a bit-reversed data buffer" all on one line. Anyway, this patch isn't necessary for the first round of patches, we are submitting now (got in by a mistake). -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 1/6] crc-itu-t: add bit-reversed calculation 2009-06-03 12:43 ` [PATCH 1/6] crc-itu-t: add bit-reversed calculation Ben Hutchings 2009-06-03 12:48 ` Dmitry Eremin-Solenikov 2009-06-04 0:49 ` Dmitry Eremin-Solenikov @ 2009-06-21 8:29 ` Dmitry Eremin-Solenikov 2009-06-21 10:18 ` Ivo van Doorn 2 siblings, 1 reply; 30+ messages in thread From: Dmitry Eremin-Solenikov @ 2009-06-21 8:29 UTC (permalink / raw) To: Ben Hutchings Cc: linux-kernel, netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Darren Salt Hi, On Wed, Jun 03, 2009 at 01:43:24PM +0100, Ben Hutchings wrote: > On Wed, 2009-06-03 at 13:33 +0400, Dmitry Eremin-Solenikov wrote: > [...] > > +/** > > + * crc_itu_t_bitreversed - Compute the CRC-ITU-T for the data buffer; > > + * the buffer content is assumed to be bit-reversed > [...] > > This short description spills onto two lines which is invalid and breaks > the generation of docs. Sorry to point this out after recommending the > patch to you. > > I've changed the description to "crc_itu_t_bitreversed - Compute the > CRC-ITU-T for a bit-reversed data buffer" all on one line. Just another not w.r.t. this patch: one should add 'select BITREVERSE' to this Kconfig entry, as it depends on bitreversing stuff. -- With best wishes Dmitry ^ permalink raw reply [flat|nested] 30+ messages in thread
* Re: [PATCH 1/6] crc-itu-t: add bit-reversed calculation 2009-06-21 8:29 ` Dmitry Eremin-Solenikov @ 2009-06-21 10:18 ` Ivo van Doorn 0 siblings, 0 replies; 30+ messages in thread From: Ivo van Doorn @ 2009-06-21 10:18 UTC (permalink / raw) To: Dmitry Eremin-Solenikov Cc: Ben Hutchings, linux-kernel, netdev, linux-wireless, davem, Stephen Rothwell, Sergey Lapin, Darren Salt [non-HTML reply, sorry about that] On Sunday 21 June 2009, Dmitry Eremin-Solenikov wrote: > Hi, > > > On Wed, Jun 03, 2009 at 01:43:24PM +0100, Ben Hutchings wrote: > > On Wed, 2009-06-03 at 13:33 +0400, Dmitry Eremin-Solenikov wrote: > > [...] > > > +/** > > > + * crc_itu_t_bitreversed - Compute the CRC-ITU-T for the data buffer; > > > + * the buffer content is assumed to be bit-reversed > > [...] > > > > This short description spills onto two lines which is invalid and breaks > > the generation of docs. Sorry to point this out after recommending the > > patch to you. > > > > I've changed the description to "crc_itu_t_bitreversed - Compute the > > CRC-ITU-T for a bit-reversed data buffer" all on one line. > > Just another not w.r.t. this patch: one should add 'select BITREVERSE' > to this Kconfig entry, as it depends on bitreversing stuff. What also might be interesting, have you checked the crc-ccitt algorithm? I had come across a crc_itu_t with bitreverse implementation in the past as well, and I could simplify the implementation by using crc-ccit and only call bitreverse on the last output. So something like: u16 crc = crc_ccitt(~0, data, len); u16 crc_itu_t = swab16(crc); Instead of bitreverse for every step, only a single byteswap was needed. You need to check if this indeed works for your driver, but this would reduce the number of times bitrev is called, and also prevents the BITREV dependency for the crc implementation. Ivo ^ permalink raw reply [flat|nested] 30+ messages in thread
end of thread, other threads:[~2009-06-21 10:18 UTC | newest] Thread overview: 30+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-06-03 9:33 [MERGE REQUEST] IEEE 802.15.4 stack: generic parts Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 1/6] crc-itu-t: add bit-reversed calculation Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 3/6] net: add IEEE 802.15.4 socket family implementation Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 5/6] ieee802154: add documentation about our stack Dmitry Eremin-Solenikov 2009-06-03 9:33 ` [PATCH 6/6] ieee802154: add simple HardMAC driver sample Dmitry Eremin-Solenikov 2009-06-03 9:39 ` [PATCH 4/6] net: add NL802154 interface for configuration of 802.15.4 devices Johannes Berg 2009-06-03 10:09 ` David Miller 2009-06-03 10:52 ` Dmitry Eremin-Solenikov 2009-06-03 11:05 ` Johannes Berg 2009-06-03 12:27 ` Dmitry Eremin-Solenikov 2009-06-04 14:12 ` Johannes Berg 2009-06-04 14:51 ` Dmitry Eremin-Solenikov 2009-06-04 15:12 ` Patrick McHardy 2009-06-04 15:14 ` Dmitry Eremin-Solenikov 2009-06-04 15:15 ` Patrick McHardy 2009-06-03 12:55 ` Sergey Lapin 2009-06-03 14:21 ` Patrick McHardy 2009-06-03 23:12 ` Dmitry Eremin-Solenikov 2009-06-03 10:08 ` [PATCH 2/6] Add constants for the ieee 802.15.4/ZigBee stack David Miller 2009-06-03 10:51 ` Dmitry Eremin-Solenikov 2009-06-03 21:19 ` David Miller 2009-06-03 23:15 ` Dmitry Eremin-Solenikov 2009-06-04 0:49 ` David Miller 2009-06-03 12:43 ` [PATCH 1/6] crc-itu-t: add bit-reversed calculation Ben Hutchings 2009-06-03 12:48 ` Dmitry Eremin-Solenikov 2009-06-04 0:49 ` Dmitry Eremin-Solenikov 2009-06-21 8:29 ` Dmitry Eremin-Solenikov 2009-06-21 10:18 ` Ivo van Doorn
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).