48b491a5cc
Commit2e9f60932a("net: hsr: check skb can contain struct hsr_ethhdr in fill_frame_info") added the following which resulted in -EINVAL always being returned: if (skb->mac_len < sizeof(struct hsr_ethhdr)) return -EINVAL; mac_len was not being set correctly so this check completely broke HSR/PRP since it was always 14, not 20. Set mac_len correctly and modify the mac_len checks to test in the correct places since sometimes it is legitimately 14. Fixes:2e9f60932a("net: hsr: check skb can contain struct hsr_ethhdr in fill_frame_info") Signed-off-by: George McCollister <george.mccollister@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
32 lines
1.1 KiB
C
32 lines
1.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* Copyright 2011-2014 Autronica Fire and Security AS
|
|
*
|
|
* Author(s):
|
|
* 2011-2014 Arvid Brodin, arvid.brodin@alten.se
|
|
*
|
|
* include file for HSR and PRP.
|
|
*/
|
|
|
|
#ifndef __HSR_FORWARD_H
|
|
#define __HSR_FORWARD_H
|
|
|
|
#include <linux/netdevice.h>
|
|
#include "hsr_main.h"
|
|
|
|
void hsr_forward_skb(struct sk_buff *skb, struct hsr_port *port);
|
|
struct sk_buff *prp_create_tagged_frame(struct hsr_frame_info *frame,
|
|
struct hsr_port *port);
|
|
struct sk_buff *hsr_create_tagged_frame(struct hsr_frame_info *frame,
|
|
struct hsr_port *port);
|
|
struct sk_buff *hsr_get_untagged_frame(struct hsr_frame_info *frame,
|
|
struct hsr_port *port);
|
|
struct sk_buff *prp_get_untagged_frame(struct hsr_frame_info *frame,
|
|
struct hsr_port *port);
|
|
bool prp_drop_frame(struct hsr_frame_info *frame, struct hsr_port *port);
|
|
bool hsr_drop_frame(struct hsr_frame_info *frame, struct hsr_port *port);
|
|
int prp_fill_frame_info(__be16 proto, struct sk_buff *skb,
|
|
struct hsr_frame_info *frame);
|
|
int hsr_fill_frame_info(__be16 proto, struct sk_buff *skb,
|
|
struct hsr_frame_info *frame);
|
|
#endif /* __HSR_FORWARD_H */
|