Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 238523e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 1ff80389 016cc850

drivers/net/pcnet32.c

+0 −5
Original line number Diff line number Diff line
@@ -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");

drivers/net/sk98lin/skge.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ SK_U64 PhysAddr; 
		} /* 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;