diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-27 11:29:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-27 11:29:31 -0700 |
| commit | f004ec728bff3cf924ffc19387baca503cd73b01 (patch) | |
| tree | d70d86b6697002cf4d71642185003d5e1bbf16f5 /Documentation/networking | |
| parent | c685bfc6c6bcb9bcc42d1345a3650d3ce5185c52 (diff) | |
| parent | 987b8816661332978efd0f85bedf9866fe2e3232 (diff) | |
| download | kernel-crypto-f004ec728bff3cf924ffc19387baca503cd73b01.tar.gz kernel-crypto-f004ec728bff3cf924ffc19387baca503cd73b01.tar.xz kernel-crypto-f004ec728bff3cf924ffc19387baca503cd73b01.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/00-INDEX | 2 | ||||
| -rw-r--r-- | Documentation/networking/ieee802154.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX index 1634c6dceca..50189bf07d5 100644 --- a/Documentation/networking/00-INDEX +++ b/Documentation/networking/00-INDEX @@ -60,6 +60,8 @@ framerelay.txt - info on using Frame Relay/Data Link Connection Identifier (DLCI). generic_netlink.txt - info on Generic Netlink +ieee802154.txt + - Linux IEEE 802.15.4 implementation, API and drivers ip-sysctl.txt - /proc/sys/net/ipv4/* variables ip_dynaddr.txt diff --git a/Documentation/networking/ieee802154.txt b/Documentation/networking/ieee802154.txt index a0280ad2edc..1d4ed66b1b1 100644 --- a/Documentation/networking/ieee802154.txt +++ b/Documentation/networking/ieee802154.txt @@ -69,7 +69,7 @@ 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 +We are going to provide intermediate layer implementing IEEE 802.15.4 MAC in software. This is currently WIP. See header include/net/ieee802154/mac802154.h and several drivers in |