[SQUASHME]: move short address generation upwards

drivers/kw2xrf/kw2xrf.c

@@ -436,18 +436,16 @@ int kw2xrf_init(kw2xrf_t *dev, spi_t spi, spi_speed_t spi_speed,
 
     cpuid_get(cpuid);
 
-#if CPUID_LEN > IEEE802154_LONG_ADDRESS_LEN
-    for (int i = IEEE802154_LONG_ADDRESS_LEN; i < CPUID_LEN; i++) {
-        cpuid[i & 0x07] ^= cpuid[i];
-    }
-#endif
-
-#if CPUID_LEN > IEEE802154_SHORT_ADDRESS_LEN
+    /* generate short hardware address if CPUID_LEN > 0 */
     for (int i = 0; i < CPUID_LEN; i++) {
         /* XOR each even byte of the CPUID with LSB of short address
            and each odd byte with MSB */
         addr_short ^= (uint16_t)(cpuid[i] << ((i & 0x01) * 8));
     }
+#if CPUID_LEN > IEEE802154_LONG_ADDRESS_LEN
+    for (int i = IEEE802154_LONG_ADDRESS_LEN; i < CPUID_LEN; i++) {
+        cpuid[i & 0x07] ^= cpuid[i];
+    }
 #endif
     /* make sure we mark the address as non-multicast and not globally unique */
     cpuid[0] &= ~(0x01);