diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /net/ethernet | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'net/ethernet')
| -rw-r--r-- | net/ethernet/eth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index f7972b7df..a1b402672 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -207,7 +207,7 @@ unsigned short eth_type_trans(struct sk_buff *skb, struct net_device *dev) * seems to set IFF_PROMISC. */ - else if(dev->flags&(IFF_PROMISC/*|IFF_ALLMULTI*/)) + else if(1 /*dev->flags&IFF_PROMISC*/) { if(memcmp(eth->h_dest,dev->dev_addr, ETH_ALEN)) skb->pkt_type=PACKET_OTHERHOST; @@ -265,7 +265,8 @@ void eth_header_cache_update(struct hh_cache *hh, struct net_device *dev, unsign memcpy(((u8*)hh->hh_data) + 2, haddr, dev->addr_len); } -#ifndef CONFIG_IP_ROUTER +#if 0 /*ndef CONFIG_IP_ROUTER*/ +/* This one is only slowdown with checksumming in user process context. --ANK */ /* * Copy from an ethernet device memory space to an sk_buff while checksumming if IP @@ -298,7 +299,7 @@ void eth_copy_and_sum(struct sk_buff *dest, unsigned char *src, int length, int if ((ip_length <= length) && (ip_length > 7)) length=ip_length; - dest->csum=csum_partial_copy(src+sizeof(struct iphdr)+ETH_HLEN,dest->data+sizeof(struct iphdr)+ETH_HLEN,length,base); + dest->csum=csum_partial_copy_nocheck(src+sizeof(struct iphdr)+ETH_HLEN,dest->data+sizeof(struct iphdr)+ETH_HLEN,length,base); dest->ip_summed=1; } |