diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-10-23 12:32:25 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-10-23 12:32:25 +0300 |
| commit | 4e5b65a22ba0cabe58f895cd797cb10a763d6994 (patch) | |
| tree | 067033eb0d1d284b6ca89c2bfa4034906ff59ad9 /include/uapi/linux | |
| parent | 4c456c9ad334a940e354da1002184bc19f4493ef (diff) | |
| parent | 05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 (diff) | |
| download | linux-4e5b65a22ba0cabe58f895cd797cb10a763d6994.tar.xz | |
Merge tag 'v6.6-rc7' into sched/core, to pick up fixes
Pick up recent sched/urgent fixes merged upstream.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/if_packet.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h index 4d0ad22f83b5..9efc42382fdb 100644 --- a/include/uapi/linux/if_packet.h +++ b/include/uapi/linux/if_packet.h @@ -18,11 +18,7 @@ struct sockaddr_ll { unsigned short sll_hatype; unsigned char sll_pkttype; unsigned char sll_halen; - union { - unsigned char sll_addr[8]; - /* Actual length is in sll_halen. */ - __DECLARE_FLEX_ARRAY(unsigned char, sll_addr_flex); - }; + unsigned char sll_addr[8]; }; /* Packet types */ |