diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-06 13:17:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-06 13:17:48 -0700 |
| commit | de7de576eca204de9a38e2f6dafe6b7c1ddc85c1 (patch) | |
| tree | 9a7fd9417ea34ddfb72d419883ff7f15b1dfff63 /drivers/net/ieee802154/Makefile | |
| parent | 70837ffe3085c9a91488b52ca13ac84424da1042 (diff) | |
| parent | be10d5d1c2d15252624e965202508f30a218a46a (diff) | |
| download | talos-obmc-linux-de7de576eca204de9a38e2f6dafe6b7c1ddc85c1.tar.gz talos-obmc-linux-de7de576eca204de9a38e2f6dafe6b7c1ddc85c1.zip | |
Merge branch 'ieee802154-for-davem-2018-08-06' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next
Stefan Schmidt says:
====================
pull-request: ieee802154-next 2018-08-06
An update from ieee802154 for *net-next*
Romuald added a socket option to get the LQI value of the received datagram.
Alexander added a new hardware simulation driver modelled after hwsim of the
wireless people. It allows runtime configuration for new nodes and edges over a
netlink interface (a config utlity is making its way into wpan-tools).
We also have three fixes in here. One from Colin which is more of a cleanup and
two from Alex fixing tailroom and single frame space problems.
I would normally put the last two into my fixes tree, but given we are already
in -rc8 I simply put them here and added a cc: stable to them.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ieee802154/Makefile')
| -rw-r--r-- | drivers/net/ieee802154/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ieee802154/Makefile b/drivers/net/ieee802154/Makefile index 104744d5a668..0c78b6298060 100644 --- a/drivers/net/ieee802154/Makefile +++ b/drivers/net/ieee802154/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_IEEE802154_ATUSB) += atusb.o obj-$(CONFIG_IEEE802154_ADF7242) += adf7242.o obj-$(CONFIG_IEEE802154_CA8210) += ca8210.o obj-$(CONFIG_IEEE802154_MCR20A) += mcr20a.o +obj-$(CONFIG_IEEE802154_HWSIM) += mac802154_hwsim.o |
