Skip to content

Commit bc6bf4e

Browse files
committed
net: net_mgmt: shift bit assignments
Shift 8 bits assigned to the layer code to the command mask instead. Leaving 7 bits (128 options) for the layer mask is plenty of space considering that there are less than 16 layers defined in-tree. On the other hand, the Wi-Fi management layer already has more than 16 unique events that can be generated. Allowing each event to be assigned a bit requires more than the 16 bits currently available. Signed-off-by: Jordan Yates <jordan@embeint.com>
1 parent f055ecc commit bc6bf4e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/zephyr/net/net_mgmt.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ struct net_if;
4040
#define NET_MGMT_ON_IFACE_MASK 0x40000000
4141
#define NET_MGMT_LAYER_MASK 0x30000000
4242
#define NET_MGMT_SYNC_EVENT_MASK 0x08000000
43-
#define NET_MGMT_LAYER_CODE_MASK 0x07FF0000
44-
#define NET_MGMT_COMMAND_MASK 0x0000FFFF
43+
#define NET_MGMT_LAYER_CODE_MASK 0x07F00000
44+
#define NET_MGMT_COMMAND_MASK 0x000FFFFF
4545

4646
#define NET_MGMT_EVENT_BIT BIT(31)
4747
#define NET_MGMT_IFACE_BIT BIT(30)
4848
#define NET_MGMT_SYNC_EVENT_BIT BIT(27)
4949

5050
#define NET_MGMT_LAYER(_layer) (_layer << 28)
51-
#define NET_MGMT_LAYER_CODE(_code) (_code << 16)
51+
#define NET_MGMT_LAYER_CODE(_code) (_code << 20)
5252

5353
#define NET_MGMT_EVENT(mgmt_request) \
5454
(mgmt_request & NET_MGMT_EVENT_MASK)
@@ -63,7 +63,7 @@ struct net_if;
6363
((mgmt_request & NET_MGMT_LAYER_MASK) >> 28)
6464

6565
#define NET_MGMT_GET_LAYER_CODE(mgmt_request) \
66-
((mgmt_request & NET_MGMT_LAYER_CODE_MASK) >> 16)
66+
((mgmt_request & NET_MGMT_LAYER_CODE_MASK) >> 20)
6767

6868
#define NET_MGMT_GET_COMMAND(mgmt_request) \
6969
(mgmt_request & NET_MGMT_COMMAND_MASK)

0 commit comments

Comments
 (0)