Lubancat2/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "net: Introduce parse_protocol header_ops callback"

Browse Source 
This reverts commit 6eef125294 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: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I56c67b283aa119d80c5f013a274622e8c6bdf2a0
This commit is contained in:
Greg Kroah-Hartman
2021-03-18 10:54:01 +01:00
parent 748b062052
commit 39f48fe49d
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/netdevice.h
View File

@ -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)