Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39f48fe4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "net: Introduce parse_protocol header_ops callback" 



This reverts commit 6eef1252 which is
commit e78b2915517e8fcadb1bc130ad6aeac7099e510c upstream.

This breaks the ABI and is not needed in the android-4.19-stable branch
as the issue it was added for is not relevant here.

Bug: 161946584
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I56c67b283aa119d80c5f013a274622e8c6bdf2a0
parent 748b0620

include/linux/netdevice.h

+0 −10
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ struct header_ops { 
				const struct net_device *dev,

				const unsigned char *haddr);

	bool	(*validate)(const char *ll_header, unsigned int len);

	__be16	(*parse_protocol)(const struct sk_buff *skb);



	ANDROID_KABI_RESERVE(1);

	ANDROID_KABI_RESERVE(2);
@@ -2948,15 +2947,6 @@ static inline int dev_parse_header(const struct sk_buff *skb, 
	return dev->header_ops->parse(skb, haddr);

}



static inline __be16 dev_parse_header_protocol(const struct sk_buff *skb)

{

	const struct net_device *dev = skb->dev;



	if (!dev->header_ops || !dev->header_ops->parse_protocol)

		return 0;

	return dev->header_ops->parse_protocol(skb);

}



/* ll_header must have at least hard_header_len allocated */

static inline bool dev_validate_header(const struct net_device *dev,

				       char *ll_header, int len)