Unverified Commit 2590ff90 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7276 llc: Drop support for ETH_P_TR_802_2. 

Merge Pull Request from: @ci-robot 
 
PR sync from: Guo Mengqi <guomengqi3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2KOPR6UBO7AYTTYGCGHAQ7RPGN3GHJIU/ 
 
https://gitee.com/src-openeuler/kernel/issues/I99JSA 
 
Link:https://gitee.com/openeuler/kernel/pulls/7276

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents b5565d86 fdddb848

include/net/llc_pdu.h

+2 −4
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type, 
 */

static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)

{

	if (skb->protocol == htons(ETH_P_802_2))

	memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);

}
@@ -275,7 +274,6 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa) 
 */

static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)

{

	if (skb->protocol == htons(ETH_P_802_2))

	memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN);

}

net/llc/llc_core.c

+0 −7
Original line number Diff line number Diff line
@@ -135,22 +135,15 @@ static struct packet_type llc_packet_type __read_mostly = { 
	.func = llc_rcv,

};



static struct packet_type llc_tr_packet_type __read_mostly = {

	.type = cpu_to_be16(ETH_P_TR_802_2),

	.func = llc_rcv,

};



static int __init llc_init(void)

{

	dev_add_pack(&llc_packet_type);

	dev_add_pack(&llc_tr_packet_type);

	return 0;

}



static void __exit llc_exit(void)

{

	dev_remove_pack(&llc_packet_type);

	dev_remove_pack(&llc_tr_packet_type);

}



module_init(llc_init);