projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[powerpc.git]
/
net
/
bridge
/
br_device.c
diff --git
a/net/bridge/br_device.c
b/net/bridge/br_device.c
index
0c88a2a
..
2afdc7c
100644
(file)
--- a/
net/bridge/br_device.c
+++ b/
net/bridge/br_device.c
@@
-145,9
+145,9
@@
static int br_set_tx_csum(struct net_device *dev, u32 data)
struct net_bridge *br = netdev_priv(dev);
if (data)
struct net_bridge *br = netdev_priv(dev);
if (data)
- br->feature_mask |= NETIF_F_
IP
_CSUM;
+ br->feature_mask |= NETIF_F_
NO
_CSUM;
else
else
- br->feature_mask &= ~NETIF_F_
IP
_CSUM;
+ br->feature_mask &= ~NETIF_F_
ALL
_CSUM;
br_features_recompute(br);
return 0;
br_features_recompute(br);
return 0;
@@
-185,5
+185,5
@@
void br_dev_setup(struct net_device *dev)
dev->priv_flags = IFF_EBRIDGE;
dev->features = NETIF_F_SG | NETIF_F_FRAGLIST
dev->priv_flags = IFF_EBRIDGE;
dev->features = NETIF_F_SG | NETIF_F_FRAGLIST
- | NETIF_F_HIGHDMA | NETIF_F_TSO | NETIF_F_
IP
_CSUM;
+ | NETIF_F_HIGHDMA | NETIF_F_TSO | NETIF_F_
NO
_CSUM;
}
}