6lowpan: ndisc: add missing 802.15.4 only check
authorAlexander Aring <aar@pengutronix.de>
Tue, 21 Jun 2016 08:27:19 +0000 (10:27 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 8 Jul 2016 10:20:57 +0000 (12:20 +0200)
This patch adds a missing check to handle short address parsing for
802.15.4 6LoWPAN only.

Signed-off-by: Alexander Aring <aar@pengutronix.de>
Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/6lowpan/ndisc.c

index 030504e031b6d7fc0722f0c8d1275008e5cb71ff..79c5fa9665fc38b972f3f394c270809556ab1526 100644 (file)
@@ -47,6 +47,9 @@ static int lowpan_ndisc_parse_options(const struct net_device *dev,
                                      struct nd_opt_hdr *nd_opt,
                                      struct ndisc_options *ndopts)
 {
+       if (!lowpan_is_ll(dev, LOWPAN_LLTYPE_IEEE802154))
+               return 0;
+
        switch (nd_opt->nd_opt_type) {
        case ND_OPT_SOURCE_LL_ADDR:
        case ND_OPT_TARGET_LL_ADDR: