From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 1 May 2016 15:59:44 +0000 (+0200)
Subject: Revert "ax25: add link layer header validation function"
X-Git-Tag: v3.16.36~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8547d08f56fb267be3a7e07d029d1db920073811;p=thirdparty%2Fkernel%2Fstable.git

Revert "ax25: add link layer header validation function"

This reverts commit ea47781c26510e5d97f80f9aceafe9065bd5e3aa, which was
commit ea47781c26510e5d97f80f9aceafe9065bd5e3aa upstream.  It is
pointless unless af_packet calls the new function.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c
index 5ee8c6fc1a755..67de6b33f2c30 100644
--- a/net/ax25/ax25_ip.c
+++ b/net/ax25/ax25_ip.c
@@ -231,24 +231,9 @@ int ax25_rebuild_header(struct sk_buff *skb)
 
 #endif
 
-static bool ax25_validate_header(const char *header, unsigned int len)
-{
-	ax25_digi digi;
-
-	if (!len)
-		return false;
-
-	if (header[0])
-		return true;
-
-	return ax25_addr_parse(header + 1, len - 1, NULL, NULL, &digi, NULL,
-			       NULL);
-}
-
 const struct header_ops ax25_header_ops = {
 	.create = ax25_hard_header,
 	.rebuild = ax25_rebuild_header,
-	.validate = ax25_validate_header,
 };
 
 EXPORT_SYMBOL(ax25_hard_header);