aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2011-11-15 10:29:55 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-16 17:43:12 -0500
commit34324dc2bf27c1773045fea63cb11f7e2a6ad2b9 (patch)
tree47cd1f4ea5590c405dc60aee70b49fb14f56859b /drivers/net/can
parenta861a8b233e9024303fb8e73e465e81ad7119d5a (diff)
net: remove NETIF_F_NO_CSUM feature bit
Only distinct use is checking if NETIF_F_NOCACHE_COPY should be enabled by default. The check heuristics is altered a bit here, so it hits other people than before. The default shouldn't be trusted for performance-critical cases anyway. For all other uses NETIF_F_NO_CSUM is equivalent to NETIF_F_HW_CSUM. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/dev.c2
-rw-r--r--drivers/net/can/slcan.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index 25695bde0549..120f1ab5a2ce 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -454,7 +454,7 @@ static void can_setup(struct net_device *dev)
454 454
455 /* New-style flags. */ 455 /* New-style flags. */
456 dev->flags = IFF_NOARP; 456 dev->flags = IFF_NOARP;
457 dev->features = NETIF_F_NO_CSUM; 457 dev->features = NETIF_F_HW_CSUM;
458} 458}
459 459
460struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) 460struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf)
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c
index a979b006f459..3f1ebcc2cb83 100644
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
@@ -387,7 +387,7 @@ static void slc_setup(struct net_device *dev)
387 387
388 /* New-style flags. */ 388 /* New-style flags. */
389 dev->flags = IFF_NOARP; 389 dev->flags = IFF_NOARP;
390 dev->features = NETIF_F_NO_CSUM; 390 dev->features = NETIF_F_HW_CSUM;
391} 391}
392 392
393/****************************************** 393/******************************************