diff options
author | alex.bluesman.smirnov@gmail.com <alex.bluesman.smirnov@gmail.com> | 2012-05-15 16:50:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-16 15:17:08 -0400 |
commit | 0606069d9ef538687957d41ed6387d665af7a643 (patch) | |
tree | b0e54cbdddc436a4b8fd48db676c0ab2efd55d6f /include/linux | |
parent | 62610ad21870a8cf842d4a48f07c3a964e1d2622 (diff) |
mac802154: monitor device support
Support for monitor device intended to capture all the network activity.
This interface could be used by networks sniffers and is already
supported by WireShark. That's a good test point to check that basic
MAC support works.
Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/if_arp.h | 1 | ||||
-rw-r--r-- | include/linux/nl802154.h | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index 3718acf40a09..26cb3c2c5c71 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h | |||
@@ -87,6 +87,7 @@ | |||
87 | #define ARPHRD_IEEE80211_PRISM 802 /* IEEE 802.11 + Prism2 header */ | 87 | #define ARPHRD_IEEE80211_PRISM 802 /* IEEE 802.11 + Prism2 header */ |
88 | #define ARPHRD_IEEE80211_RADIOTAP 803 /* IEEE 802.11 + radiotap header */ | 88 | #define ARPHRD_IEEE80211_RADIOTAP 803 /* IEEE 802.11 + radiotap header */ |
89 | #define ARPHRD_IEEE802154 804 | 89 | #define ARPHRD_IEEE802154 804 |
90 | #define ARPHRD_IEEE802154_MONITOR 805 /* IEEE 802.15.4 network monitor */ | ||
90 | 91 | ||
91 | #define ARPHRD_PHONET 820 /* PhoNet media type */ | 92 | #define ARPHRD_PHONET 820 /* PhoNet media type */ |
92 | #define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */ | 93 | #define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */ |
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h index 2015ad248101..5a3db3aa5f17 100644 --- a/include/linux/nl802154.h +++ b/include/linux/nl802154.h | |||
@@ -129,6 +129,20 @@ enum { | |||
129 | 129 | ||
130 | enum { | 130 | enum { |
131 | __IEEE802154_DEV_INVALID = -1, | 131 | __IEEE802154_DEV_INVALID = -1, |
132 | |||
133 | /* TODO: | ||
134 | * Nowadays three device types supported by this stack at linux-zigbee | ||
135 | * project: WPAN = 0, MONITOR = 1 and SMAC = 2. | ||
136 | * | ||
137 | * Since this stack implementation exists many years, it's definitely | ||
138 | * bad idea to change the assigned values due to they are already used | ||
139 | * by third-party userspace software like: iz-tools, wireshark... | ||
140 | * | ||
141 | * Currently only monitor device is added and initialized by '1' for | ||
142 | * compatibility. | ||
143 | */ | ||
144 | IEEE802154_DEV_MONITOR = 1, | ||
145 | |||
132 | __IEEE802154_DEV_MAX, | 146 | __IEEE802154_DEV_MAX, |
133 | }; | 147 | }; |
134 | 148 | ||