[PATCH net-next] net: Fix typo in netdev_intersect_features

Subsystems: networking drivers, networking [general], the rest

STALE3886d

3 messages, 3 authors, 2016-01-12 · open the first message on its own page

[PATCH net-next] net: Fix typo in netdev_intersect_features

From: Tom Herbert <hidden>
Date: 2016-01-11 18:20:20 

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 <redacted>
Signed-off-by: Tom Herbert <redacted>
---
 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

Re: [PATCH net-next] net: Fix typo in netdev_intersect_features

From: Sergei Shtylyov <hidden>
Date: 2016-01-11 18:24:45 

Hello.

On 01/11/2016 09:19 PM, Tom Herbert wrote:
quoted hunk
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 <redacted>
Signed-off-by: Tom Herbert <redacted>
---
  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

Re: [PATCH net-next] net: Fix typo in netdev_intersect_features

From: David Miller <davem@davemloft.net>
Date: 2016-01-12 04:30:12 

From: Tom Herbert <redacted>
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 <redacted>
Signed-off-by: Tom Herbert <redacted>
Applied, thanks Tom.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help