Merge branch 'for-4.1/drivers' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / include / linux / ieee802154.h

diff --git a/include/linux/ieee802154.h b/include/linux/ieee802154.h
index 6e82d888287c280e096bc4c8c4cd585f786fb507..8872ca103d0699bb7c0c6ab2a898302d920b41dd 100644 (file)
--- a/include/linux/ieee802154.h
+++ b/include/linux/ieee802154.h
@@ -28,7 +28,9 @@
 #include <asm/byteorder.h>
 
 #define IEEE802154_MTU                 127
-#define IEEE802154_MIN_PSDU_LEN                5
+#define IEEE802154_ACK_PSDU_LEN                5
+#define IEEE802154_MIN_PSDU_LEN                9
+#define IEEE802154_FCS_LEN             2
 
 #define IEEE802154_PAN_ID_BROADCAST    0xffff
 #define IEEE802154_ADDR_SHORT_BROADCAST        0xffff
@@ -38,6 +40,7 @@
 
 #define IEEE802154_LIFS_PERIOD         40
 #define IEEE802154_SIFS_PERIOD         12
+#define IEEE802154_MAX_SIFS_FRAME_SIZE 18
 
 #define IEEE802154_MAX_CHANNEL         26
 #define IEEE802154_MAX_PAGE            31
@@ -204,11 +207,18 @@ enum {
 
 /**
  * ieee802154_is_valid_psdu_len - check if psdu len is valid
+ * available lengths:
+ *     0-4     Reserved
+ *     5       MPDU (Acknowledgment)
+ *     6-8     Reserved
+ *     9-127   MPDU
+ *
  * @len: psdu len with (MHR + payload + MFR)
  */
 static inline bool ieee802154_is_valid_psdu_len(const u8 len)
 {
-       return (len >= IEEE802154_MIN_PSDU_LEN && len <= IEEE802154_MTU);
+       return (len == IEEE802154_ACK_PSDU_LEN ||
+               (len >= IEEE802154_MIN_PSDU_LEN && len <= IEEE802154_MTU));
 }
 
 /**