* [PATCH net-next] net: Fix typo in netdev_intersect_features
@ 2016-01-11 18:19 Tom Herbert
2016-01-11 18:24 ` Sergei Shtylyov
2016-01-12 4:30 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Tom Herbert @ 2016-01-11 18:19 UTC (permalink / raw)
To: davem, netdev; +Cc: jackm, kernel-team
Obviously need to 'or in NETIF_F_IP_CSUM and NETIF_F_IPV6_CSUM.
Fixes: c8cd0989bd151f ("net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM")
Reported-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Tom Herbert <tom@herbertland.com>
---
include/linux/netdevice.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 8d8e5ca..a951274 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -3871,9 +3871,9 @@ static inline netdev_features_t netdev_intersect_features(netdev_features_t f1,
{
if ((f1 ^ f2) & NETIF_F_HW_CSUM) {
if (f1 & NETIF_F_HW_CSUM)
- f1 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM);
+ f1 |= (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);
else
- f2 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM);
+ f2 |= (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);
}
return f1 & f2;
--
2.4.6
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: Fix typo in netdev_intersect_features
2016-01-11 18:19 [PATCH net-next] net: Fix typo in netdev_intersect_features Tom Herbert
@ 2016-01-11 18:24 ` Sergei Shtylyov
2016-01-12 4:30 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2016-01-11 18:24 UTC (permalink / raw)
To: Tom Herbert, davem, netdev; +Cc: jackm, kernel-team
Hello.
On 01/11/2016 09:19 PM, Tom Herbert wrote:
> Obviously need to 'or in NETIF_F_IP_CSUM and NETIF_F_IPV6_CSUM.
>
> Fixes: c8cd0989bd151f ("net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM")
> Reported-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
> Signed-off-by: Tom Herbert <tom@herbertland.com>
> ---
> include/linux/netdevice.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index 8d8e5ca..a951274 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -3871,9 +3871,9 @@ static inline netdev_features_t netdev_intersect_features(netdev_features_t f1,
> {
> if ((f1 ^ f2) & NETIF_F_HW_CSUM) {
> if (f1 & NETIF_F_HW_CSUM)
> - f1 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM);
> + f1 |= (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);
> else
> - f2 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM);
> + f2 |= (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);
The general kernel coding style is to have the operators surrounded by spaces.
[...]
WBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: Fix typo in netdev_intersect_features
2016-01-11 18:19 [PATCH net-next] net: Fix typo in netdev_intersect_features Tom Herbert
2016-01-11 18:24 ` Sergei Shtylyov
@ 2016-01-12 4:30 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-01-12 4:30 UTC (permalink / raw)
To: tom; +Cc: netdev, jackm, kernel-team
From: Tom Herbert <tom@herbertland.com>
Date: Mon, 11 Jan 2016 10:19:10 -0800
> Obviously need to 'or in NETIF_F_IP_CSUM and NETIF_F_IPV6_CSUM.
>
> Fixes: c8cd0989bd151f ("net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM")
> Reported-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
> Signed-off-by: Tom Herbert <tom@herbertland.com>
Applied, thanks Tom.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-12 4:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-11 18:19 [PATCH net-next] net: Fix typo in netdev_intersect_features Tom Herbert
2016-01-11 18:24 ` Sergei Shtylyov
2016-01-12 4:30 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).