diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 11:12:55 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 11:12:55 +0900 |
| commit | ca371d2854d48c0c22e7aa031df182f96dc85820 (patch) | |
| tree | 1c62be8b4da0bfc82fa7ffa1ad5b0e958266cbd1 /include/net/ieee802154.h | |
| parent | 0d376945d0bc0a8f8e00861d506b10e42e8af372 (diff) | |
| parent | a0e86bd4252519321b0d102dc4ed90557aa7bee9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Conflicts:
arch/arm/mach-shmobile/clock-sh73a0.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/net/ieee802154.h')
| -rw-r--r-- | include/net/ieee802154.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/ieee802154.h b/include/net/ieee802154.h index d52685defb1..ee59f8b188d 100644 --- a/include/net/ieee802154.h +++ b/include/net/ieee802154.h @@ -21,11 +21,14 @@ * Maxim Gorbachyov <maxim.gorbachev@siemens.com> * Maxim Osipov <maxim.osipov@siemens.com> * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> + * Alexander Smirnov <alex.bluesman.smirnov@gmail.com> */ #ifndef NET_IEEE802154_H #define NET_IEEE802154_H +#define IEEE802154_MTU 127 + #define IEEE802154_FC_TYPE_BEACON 0x0 /* Frame is beacon */ #define IEEE802154_FC_TYPE_DATA 0x1 /* Frame is data */ #define IEEE802154_FC_TYPE_ACK 0x2 /* Frame is acknowledgment */ @@ -56,6 +59,9 @@ (((x) & IEEE802154_FC_DAMODE_MASK) >> IEEE802154_FC_DAMODE_SHIFT) +/* MAC footer size */ +#define IEEE802154_MFR_SIZE 2 /* 2 octets */ + /* MAC's Command Frames Identifiers */ #define IEEE802154_CMD_ASSOCIATION_REQ 0x01 #define IEEE802154_CMD_ASSOCIATION_RESP 0x02 |