From 6635f9a873b33e60eae489ffc4ce21ff664d74e4 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Thu, 22 Jun 2023 09:51:54 +0000
Subject: [PATCH] Revert "neighbour: fix unaligned access to pneigh_entry"

This reverts commit 7e0da73ce546ae2f1f449b1d7207eeead9cb530d which is
commit ed779fe4c9b5a20b4ab4fd6f3e19807445bb78c7.

It breaks the Android kernel ABI, and is not needed for Android systems,
so it is safe to revert.

Bug: 161946584
Change-Id: I415d35f983e65c2ce732f1089861e80990d63451
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---
 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 c5e9e03ce068..28375e40b72d 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -174,7 +174,7 @@ struct pneigh_entry {
 	struct net_device	*dev;
 	u8			flags;
 	u8			protocol;
-	u32			key[];
+	u8			key[];
 };
 
 /*