diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-11-15 10:29:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-16 17:43:12 -0500 |
commit | 34324dc2bf27c1773045fea63cb11f7e2a6ad2b9 (patch) | |
tree | 47cd1f4ea5590c405dc60aee70b49fb14f56859b /drivers/net | |
parent | a861a8b233e9024303fb8e73e465e81ad7119d5a (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')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 2 | ||||
-rw-r--r-- | drivers/net/can/dev.c | 2 | ||||
-rw-r--r-- | drivers/net/can/slcan.c | 2 | ||||
-rw-r--r-- | drivers/net/dummy.c | 2 | ||||
-rw-r--r-- | drivers/net/ifb.c | 2 | ||||
-rw-r--r-- | drivers/net/loopback.c | 2 | ||||
-rw-r--r-- | drivers/net/veth.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index ac5337a04639..25a44d94be17 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -4361,7 +4361,7 @@ static void bond_setup(struct net_device *bond_dev) | |||
4361 | NETIF_F_HW_VLAN_RX | | 4361 | NETIF_F_HW_VLAN_RX | |
4362 | NETIF_F_HW_VLAN_FILTER; | 4362 | NETIF_F_HW_VLAN_FILTER; |
4363 | 4363 | ||
4364 | bond_dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_NO_CSUM); | 4364 | bond_dev->hw_features &= ~(NETIF_F_ALL_CSUM & ~NETIF_F_HW_CSUM); |
4365 | bond_dev->features |= bond_dev->hw_features; | 4365 | bond_dev->features |= bond_dev->hw_features; |
4366 | } | 4366 | } |
4367 | 4367 | ||
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 | ||
460 | struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) | 460 | struct 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 | /****************************************** |
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c index a7c5e8831e8c..087648ea1edb 100644 --- a/drivers/net/dummy.c +++ b/drivers/net/dummy.c | |||
@@ -134,7 +134,7 @@ static void dummy_setup(struct net_device *dev) | |||
134 | dev->flags |= IFF_NOARP; | 134 | dev->flags |= IFF_NOARP; |
135 | dev->flags &= ~IFF_MULTICAST; | 135 | dev->flags &= ~IFF_MULTICAST; |
136 | dev->features |= NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO; | 136 | dev->features |= NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO; |
137 | dev->features |= NETIF_F_NO_CSUM | NETIF_F_HIGHDMA | NETIF_F_LLTX; | 137 | dev->features |= NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_LLTX; |
138 | random_ether_addr(dev->dev_addr); | 138 | random_ether_addr(dev->dev_addr); |
139 | } | 139 | } |
140 | 140 | ||
diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c index 46b5f5fd686b..e05b645bbc32 100644 --- a/drivers/net/ifb.c +++ b/drivers/net/ifb.c | |||
@@ -164,7 +164,7 @@ static const struct net_device_ops ifb_netdev_ops = { | |||
164 | .ndo_validate_addr = eth_validate_addr, | 164 | .ndo_validate_addr = eth_validate_addr, |
165 | }; | 165 | }; |
166 | 166 | ||
167 | #define IFB_FEATURES (NETIF_F_NO_CSUM | NETIF_F_SG | NETIF_F_FRAGLIST | \ | 167 | #define IFB_FEATURES (NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_FRAGLIST | \ |
168 | NETIF_F_TSO_ECN | NETIF_F_TSO | NETIF_F_TSO6 | \ | 168 | NETIF_F_TSO_ECN | NETIF_F_TSO | NETIF_F_TSO6 | \ |
169 | NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_TX) | 169 | NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_TX) |
170 | 170 | ||
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 4ce9e5f2c069..b71998d0b5b4 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c | |||
@@ -169,7 +169,7 @@ static void loopback_setup(struct net_device *dev) | |||
169 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | 169 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST |
170 | | NETIF_F_ALL_TSO | 170 | | NETIF_F_ALL_TSO |
171 | | NETIF_F_UFO | 171 | | NETIF_F_UFO |
172 | | NETIF_F_NO_CSUM | 172 | | NETIF_F_HW_CSUM |
173 | | NETIF_F_RXCSUM | 173 | | NETIF_F_RXCSUM |
174 | | NETIF_F_HIGHDMA | 174 | | NETIF_F_HIGHDMA |
175 | | NETIF_F_LLTX | 175 | | NETIF_F_LLTX |
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index d32a75fb6d21..b576812bdc59 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c | |||
@@ -271,7 +271,7 @@ static void veth_setup(struct net_device *dev) | |||
271 | dev->features |= NETIF_F_LLTX; | 271 | dev->features |= NETIF_F_LLTX; |
272 | dev->destructor = veth_dev_free; | 272 | dev->destructor = veth_dev_free; |
273 | 273 | ||
274 | dev->hw_features = NETIF_F_NO_CSUM | NETIF_F_SG | NETIF_F_RXCSUM; | 274 | dev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_RXCSUM; |
275 | } | 275 | } |
276 | 276 | ||
277 | /* | 277 | /* |