diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-22 12:55:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-22 12:55:32 -0800 |
| commit | d29d1c4957d4dde1a7578b10f2a2d1fae39bd47a (patch) | |
| tree | b41c5aa5786c702502de08f1560751c51170156e /include/linux/etherdevice.h | |
| parent | 5328b633c9b3c3af38bec8cb70120658c0866e0a (diff) | |
| parent | 41f5f63cd17530d9eddaf99a71f5d069afd787d8 (diff) | |
Merge branch 'AF_PACKET-transport_offset-fix'
Maxim Mikityanskiy says:
====================
AF_PACKET transport_offset fix
This patch series contains the implementation of the RFC that was posted
on this mailing list previously:
https://www.spinics.net/lists/netdev/msg541709.html
It fixes having incorrect skb->transport_header values in cases when
dissect fails. Having correct values set by the kernel fixes mlx5
operation and allows to remove some unnecessary code flows in mlx5.
v2 changes:
- Rebase against the fresh net-next.
- Don't return bool from skb_probe_transport_header (and don't rename
the function).
- WARN_ON_ONCE and error path in case of GSO without the L4 header.
====================
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/etherdevice.h')
| -rw-r--r-- | include/linux/etherdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index 2c0af7b00715..e2f3b21cd72a 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -44,6 +44,7 @@ int eth_header_cache(const struct neighbour *neigh, struct hh_cache *hh, __be16 type); void eth_header_cache_update(struct hh_cache *hh, const struct net_device *dev, const unsigned char *haddr); +__be16 eth_header_parse_protocol(const struct sk_buff *skb); int eth_prepare_mac_addr_change(struct net_device *dev, void *p); void eth_commit_mac_addr_change(struct net_device *dev, void *p); int eth_mac_addr(struct net_device *dev, void *p); |
