diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 16:41:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 16:41:37 -0800 |
| commit | 238523e1a15874b88955ff9c8f63e35597ae2857 (patch) | |
| tree | 3a794b119a40a7dd5bd73b513297c4580a090303 | |
| parent | 1ff8038988adecfde71d82c0597727fc239d4e8c (diff) | |
| parent | 016cc85072944bfa03c5e4b587ae89588ce2e5df (diff) | |
| download | kernel_samsung_aries-238523e1a15874b88955ff9c8f63e35597ae2857.zip kernel_samsung_aries-238523e1a15874b88955ff9c8f63e35597ae2857.tar.gz kernel_samsung_aries-238523e1a15874b88955ff9c8f63e35597ae2857.tar.bz2 | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| -rw-r--r-- | drivers/net/pcnet32.c | 5 | ||||
| -rw-r--r-- | drivers/net/sk98lin/skge.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index be31922..8f6cf8c 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c @@ -1251,12 +1251,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) if (memcmp(promaddr, dev->dev_addr, 6) || !is_valid_ether_addr(dev->dev_addr)) { -#ifndef __powerpc__ if (is_valid_ether_addr(promaddr)) { -#else - if (!is_valid_ether_addr(dev->dev_addr) - && is_valid_ether_addr(promaddr)) { -#endif if (pcnet32_debug & NETIF_MSG_PROBE) { printk(" warning: CSR address invalid,\n"); printk(KERN_INFO " using instead PROM address of"); diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index 00c5d7f..ae73439 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c @@ -818,7 +818,7 @@ uintptr_t VNextDescr; /* the virtual bus address of the next descriptor */ /* set the pointers right */ pDescr->VNextRxd = VNextDescr & 0xffffffffULL; pDescr->pNextRxd = pNextDescr; - pDescr->TcpSumStarts = 0; + if (!IsTx) pDescr->TcpSumStarts = ETH_HLEN << 16 | ETH_HLEN; /* advance one step */ pPrevDescr = pDescr; @@ -2169,7 +2169,7 @@ rx_start: } /* frame > SK_COPY_TRESHOLD */ #ifdef USE_SK_RX_CHECKSUM - pMsg->csum = pRxd->TcpSums; + pMsg->csum = pRxd->TcpSums & 0xffff; pMsg->ip_summed = CHECKSUM_HW; #else pMsg->ip_summed = CHECKSUM_NONE; |