diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-06-17 22:06:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-06-17 22:06:05 -0700 |
| commit | 8648b3053bff39a7ee4c711d74268079c928a657 (patch) | |
| tree | 6de70eedf63c4b965d04040323827f1bc520ccdf /net/bridge/br_if.c | |
| parent | 00b7050426da8e7e58c889c5c80a19920d2d41b3 (diff) | |
| download | kernel_samsung_aries-8648b3053bff39a7ee4c711d74268079c928a657.zip kernel_samsung_aries-8648b3053bff39a7ee4c711d74268079c928a657.tar.gz kernel_samsung_aries-8648b3053bff39a7ee4c711d74268079c928a657.tar.bz2 | |
[NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM
The current stack treats NETIF_F_HW_CSUM and NETIF_F_NO_CSUM
identically so we test for them in quite a few places. For the sake
of brevity, I'm adding the macro NETIF_F_GEN_CSUM for these two. We
also test the disjunct of NETIF_F_IP_CSUM and the other two in various
places, for that purpose I've added NETIF_F_ALL_CSUM.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_if.c')
| -rw-r--r-- | net/bridge/br_if.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index f5d47bf..90c95f5 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -376,8 +376,7 @@ void br_features_recompute(struct net_bridge *br) checksum = br->feature_mask & NETIF_F_IP_CSUM; list_for_each_entry(p, &br->port_list, list) { - if (!(p->dev->features - & (NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM))) + if (!(p->dev->features & NETIF_F_ALL_CSUM)) checksum = 0; features &= p->dev->features; } |