Merge branch 'pcmcia' of git://git.armlinux.org.uk/~rmk/linux-arm

[karo-tx-linux.git] / net / 6lowpan / ndisc.c

diff --git a/net/6lowpan/ndisc.c b/net/6lowpan/ndisc.c
index 86450b7e2899377b3f5d6bc5aa41a54639c4dffc..941df2fa4448952059fad26a9ef75a4a35d98d39 100644 (file)
--- a/net/6lowpan/ndisc.c
+++ b/net/6lowpan/ndisc.c
@@ -101,8 +101,6 @@ static void lowpan_ndisc_802154_update(struct neighbour *n, u32 flags,
                ieee802154_be16_to_le16(&neigh->short_addr, lladdr_short);
                if (!lowpan_802154_is_valid_src_short_addr(neigh->short_addr))
                        neigh->short_addr = cpu_to_le16(IEEE802154_ADDR_SHORT_UNSPEC);
-       } else {
-               neigh->short_addr = cpu_to_le16(IEEE802154_ADDR_SHORT_UNSPEC);
        }
        write_unlock_bh(&n->lock);
 }