]> www.infradead.org Git - users/jedix/linux-maple.git/commit
uapi/if_ether.h: prevent redefinition of struct ethhdr
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 14 Feb 2019 13:18:00 +0000 (14:18 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Feb 2019 09:20:44 +0000 (10:20 +0100)
commit03089bb1f4974cb8cf0667d6632684d16916b95b
tree30497b8a848a81761b171ab6aded6a0a81e57889
parent883d561c49ebf1d540c3657892995692118afa91
uapi/if_ether.h: prevent redefinition of struct ethhdr

commit 6926e041a8920c8ec27e4e155efa760aa01551fd upstream.

Musl provides its own ethhdr struct definition. Add a guard to prevent
its definition of the appropriate musl header has already been included.

glibc does not implement this header, but when glibc will implement this
they can just define __UAPI_DEF_ETHHDR 0 to make it work with the
kernel.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/uapi/linux/if_ether.h
include/uapi/linux/libc-compat.h