* [PATCH net-next] net: bridge: use eth_type_vlan in br_dev_queue_push_xmit
@ 2021-01-14 7:51 ` menglong8.dong
0 siblings, 0 replies; 4+ messages in thread
From: menglong8.dong @ 2021-01-14 7:51 UTC (permalink / raw)
To: kuba; +Cc: roopa, nikolay, davem, bridge, netdev, linux-kernel, Menglong Dong
From: Menglong Dong <dong.menglong@zte.com.cn>
Replace the check for ETH_P_8021Q and ETH_P_8021AD in
br_dev_queue_push_xmit with eth_type_vlan.
Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
net/bridge/br_forward.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index e28ffadd1371..6e9b049ae521 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -39,8 +39,7 @@ int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb
br_drop_fake_rtable(skb);
if (skb->ip_summed == CHECKSUM_PARTIAL &&
- (skb->protocol == htons(ETH_P_8021Q) ||
- skb->protocol == htons(ETH_P_8021AD))) {
+ eth_type_vlan(skb->protocol)) {
int depth;
if (!__vlan_get_protocol(skb, skb->protocol, &depth))
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Bridge] [PATCH net-next] net: bridge: use eth_type_vlan in br_dev_queue_push_xmit
@ 2021-01-14 7:51 ` menglong8.dong
0 siblings, 0 replies; 4+ messages in thread
From: menglong8.dong @ 2021-01-14 7:51 UTC (permalink / raw)
To: kuba; +Cc: Menglong Dong, netdev, bridge, linux-kernel, nikolay, roopa, davem
From: Menglong Dong <dong.menglong@zte.com.cn>
Replace the check for ETH_P_8021Q and ETH_P_8021AD in
br_dev_queue_push_xmit with eth_type_vlan.
Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
net/bridge/br_forward.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index e28ffadd1371..6e9b049ae521 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -39,8 +39,7 @@ int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb
br_drop_fake_rtable(skb);
if (skb->ip_summed == CHECKSUM_PARTIAL &&
- (skb->protocol == htons(ETH_P_8021Q) ||
- skb->protocol == htons(ETH_P_8021AD))) {
+ eth_type_vlan(skb->protocol)) {
int depth;
if (!__vlan_get_protocol(skb, skb->protocol, &depth))
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] net: bridge: use eth_type_vlan in br_dev_queue_push_xmit
2021-01-14 7:51 ` [Bridge] " menglong8.dong
@ 2021-01-14 17:51 ` Nikolay Aleksandrov
-1 siblings, 0 replies; 4+ messages in thread
From: Nikolay Aleksandrov @ 2021-01-14 17:51 UTC (permalink / raw)
To: menglong8.dong, kuba
Cc: roopa, davem, bridge, netdev, linux-kernel, Menglong Dong
On 14/01/2021 09:51, menglong8.dong@gmail.com wrote:
> From: Menglong Dong <dong.menglong@zte.com.cn>
>
> Replace the check for ETH_P_8021Q and ETH_P_8021AD in
> br_dev_queue_push_xmit with eth_type_vlan.
>
> Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
> ---
> net/bridge/br_forward.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
> index e28ffadd1371..6e9b049ae521 100644
> --- a/net/bridge/br_forward.c
> +++ b/net/bridge/br_forward.c
> @@ -39,8 +39,7 @@ int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb
> br_drop_fake_rtable(skb);
>
> if (skb->ip_summed == CHECKSUM_PARTIAL &&
> - (skb->protocol == htons(ETH_P_8021Q) ||
> - skb->protocol == htons(ETH_P_8021AD))) {
> + eth_type_vlan(skb->protocol)) {
> int depth;
>
> if (!__vlan_get_protocol(skb, skb->protocol, &depth))
>
Please change all similar checks, there are also:
br_netlink.c - br_validate()
br_vlan.c - br_vlan_set_proto()
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Bridge] [PATCH net-next] net: bridge: use eth_type_vlan in br_dev_queue_push_xmit
@ 2021-01-14 17:51 ` Nikolay Aleksandrov
0 siblings, 0 replies; 4+ messages in thread
From: Nikolay Aleksandrov @ 2021-01-14 17:51 UTC (permalink / raw)
To: menglong8.dong, kuba
Cc: Menglong Dong, netdev, bridge, linux-kernel, roopa, davem
On 14/01/2021 09:51, menglong8.dong@gmail.com wrote:
> From: Menglong Dong <dong.menglong@zte.com.cn>
>
> Replace the check for ETH_P_8021Q and ETH_P_8021AD in
> br_dev_queue_push_xmit with eth_type_vlan.
>
> Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
> ---
> net/bridge/br_forward.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
> index e28ffadd1371..6e9b049ae521 100644
> --- a/net/bridge/br_forward.c
> +++ b/net/bridge/br_forward.c
> @@ -39,8 +39,7 @@ int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb
> br_drop_fake_rtable(skb);
>
> if (skb->ip_summed == CHECKSUM_PARTIAL &&
> - (skb->protocol == htons(ETH_P_8021Q) ||
> - skb->protocol == htons(ETH_P_8021AD))) {
> + eth_type_vlan(skb->protocol)) {
> int depth;
>
> if (!__vlan_get_protocol(skb, skb->protocol, &depth))
>
Please change all similar checks, there are also:
br_netlink.c - br_validate()
br_vlan.c - br_vlan_set_proto()
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-14 17:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-14 7:51 [PATCH net-next] net: bridge: use eth_type_vlan in br_dev_queue_push_xmit menglong8.dong
2021-01-14 7:51 ` [Bridge] " menglong8.dong
2021-01-14 17:51 ` Nikolay Aleksandrov
2021-01-14 17:51 ` [Bridge] " Nikolay Aleksandrov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.