Merge branch 'for-upstream' of... (c3543688) · Commits · 戴 / test

Documentation/networking/ieee802154.txt

+11 −15

Original line number	Diff line number	Diff line
		@@ -4,20 +4,20 @@

		Introduction
		============
		The IEEE 802.15.4 working group focuses on standardization of bottom
		two layers: Medium Access Control (MAC) and Physical (PHY). And there
		The IEEE 802.15.4 working group focuses on standardization of the bottom
		two layers: Medium Access Control (MAC) and Physical access (PHY). And there
		are mainly two options available for upper layers:
		- ZigBee - proprietary protocol from the ZigBee Alliance
		- 6LoWPAN - IPv6 networking over low rate personal area networks

		The linux-wpan project goal is to provide a complete implementation
		The goal of the Linux-wpan is to provide a complete implementation
		of the IEEE 802.15.4 and 6LoWPAN protocols. IEEE 802.15.4 is a stack
		of protocols for organizing Low-Rate Wireless Personal Area Networks.

		The stack is composed of three main parts:
		- IEEE 802.15.4 layer; We have chosen 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
		the generic Linux networking stack to transfer IEEE 802.15.4 data
		messages and a special protocol over netlink for configuration/management
		- MAC - provides access to shared channel and reliable data delivery
		- PHY - represents device drivers

		@@ -33,15 +33,13 @@ include/net/af_ieee802154.h header or in the special header
		in the userspace package (see either http://wpan.cakelab.org/ or the
		git tree at https://github.com/linux-wpan/wpan-tools).

		One can use SOCK_RAW for passing raw data towards device xmit function. YMMV.


		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.
		exports a management (e.g. 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.
		@@ -106,7 +104,7 @@ Fake drivers

		In addition there is a driver available which simulates a real device with
		SoftMAC (fakelb - IEEE 802.15.4 loopback driver) interface. This option
		provides possibility to test and debug stack without usage of real hardware.
		provides a possibility to test and debug the stack without usage of real hardware.

		See sources in drivers/net/ieee802154 folder for more details.

		@@ -125,17 +123,15 @@ to support the IPv6 minimum MTU requirement [RFC2460], and stateless header
		compression for IPv6 datagrams (LOWPAN_HC1 and LOWPAN_HC2) to reduce the
		relatively large IPv6 and UDP headers down to (in the best case) several bytes.

		In Semptember 2011 the standard update was published - [RFC6282].
		In September 2011 the standard update was published - [RFC6282].
		It deprecates HC1 and HC2 compression and defines IPHC encoding format which is
		used in this Linux implementation.

		All the code related to 6lowpan you may find in files: net/6lowpan/*
		and net/ieee802154/6lowpan/*

		To setup 6lowpan interface you need (busybox release > 1.17.0):
		1. Add IEEE802.15.4 interface and initialize PANid;
		To setup a 6LoWPAN interface you need:
		1. Add IEEE802.15.4 interface and set channel and PAN ID;
		2. Add 6lowpan interface by command like:
		# ip link add link wpan0 name lowpan0 type lowpan
		3. Set MAC (if needs):
		# ip link set lowpan0 address de:ad:be:ef:ca:fe:ba:be
		4. Bring up 'lowpan0' interface
		3. Bring up 'lowpan0' interface

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -6105,6 +6105,7 @@ F: drivers/idle/i7300_idle.c

		IEEE 802.15.4 SUBSYSTEM
		M: Alexander Aring <aar@pengutronix.de>
		M: Stefan Schmidt <stefan@osg.samsung.com>
		L: linux-wpan@vger.kernel.org
		W: http://wpan.cakelab.org/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git

drivers/bluetooth/hci_bcsp.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -733,9 +733,7 @@ static int bcsp_open(struct hci_uart *hu)
		skb_queue_head_init(&bcsp->rel);
		skb_queue_head_init(&bcsp->unrel);

		init_timer(&bcsp->tbcsp);
		bcsp->tbcsp.function = bcsp_timed_event;
		bcsp->tbcsp.data = (u_long)hu;
		setup_timer(&bcsp->tbcsp, bcsp_timed_event, (u_long)hu);

		bcsp->rx_state = BCSP_W4_PKT_DELIMITER;

drivers/bluetooth/hci_h5.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -204,9 +204,7 @@ static int h5_open(struct hci_uart *hu)

		h5_reset_rx(h5);

		init_timer(&h5->timer);
		h5->timer.function = h5_timed_event;
		h5->timer.data = (unsigned long)hu;
		setup_timer(&h5->timer, h5_timed_event, (unsigned long)hu);

		h5->tx_win = H5_TX_WIN_MAX;

drivers/bluetooth/hci_qca.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -438,14 +438,11 @@ static int qca_open(struct hci_uart *hu)

		hu->priv = qca;

		init_timer(&qca->wake_retrans_timer);
		qca->wake_retrans_timer.function = hci_ibs_wake_retrans_timeout;
		qca->wake_retrans_timer.data = (u_long)hu;
		setup_timer(&qca->wake_retrans_timer, hci_ibs_wake_retrans_timeout,
		(u_long)hu);
		qca->wake_retrans = IBS_WAKE_RETRANS_TIMEOUT_MS;

		init_timer(&qca->tx_idle_timer);
		qca->tx_idle_timer.function = hci_ibs_tx_idle_timeout;
		qca->tx_idle_timer.data = (u_long)hu;
		setup_timer(&qca->tx_idle_timer, hci_ibs_tx_idle_timeout, (u_long)hu);
		qca->tx_idle_delay = IBS_TX_IDLE_TIMEOUT_MS;

		BT_DBG("HCI_UART_QCA open, tx_idle_delay=%u, wake_retrans=%u",

Admin message