From 2f2122a869394074fa55a66af652a857fd78bd82 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Jun 2023 10:28:01 +0000 Subject: [PATCH] Revert "neighbour: fix unaligned access to pneigh_entry" This reverts commit 9fcc3c3d26a049aa04e0bc0462f84a9a775f428e which is commit ed779fe4c9b5a20b4ab4fd6f3e19807445bb78c7 upstream. It breaks the Android kernel abi and is not needed for Android systems, so it is safe to revert. Bug: 161946584 Change-Id: I0aa37ddcb0939b55d0d1b74ab3e0432b02cc5285 Signed-off-by: Greg Kroah-Hartman --- include/net/neighbour.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 67093655d796..7750ef0fe0dd 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -180,7 +180,7 @@ struct pneigh_entry { struct net_device *dev; u8 flags; u8 protocol; - u32 key[]; + u8 key[]; }; /*