Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
This commit is contained in:
commit
238523e1a1
|
@ -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");
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue