tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 238523e1 1ff80389

+2 -7
unified split
-5
drivers/net/pcnet32.c
··· 1251 1251 1252 1252 if (memcmp(promaddr, dev->dev_addr, 6) 1253 1253 || !is_valid_ether_addr(dev->dev_addr)) { 1254 - #ifndef __powerpc__ 1255 1254 if (is_valid_ether_addr(promaddr)) { 1256 - #else 1257 - if (!is_valid_ether_addr(dev->dev_addr) 1258 - && is_valid_ether_addr(promaddr)) { 1259 - #endif 1260 1255 if (pcnet32_debug & NETIF_MSG_PROBE) { 1261 1256 printk(" warning: CSR address invalid,\n"); 1262 1257 printk(KERN_INFO " using instead PROM address of");
+2 -2
drivers/net/sk98lin/skge.c
··· 818 818 /* set the pointers right */ 819 819 pDescr->VNextRxd = VNextDescr & 0xffffffffULL; 820 820 pDescr->pNextRxd = pNextDescr; 821 - pDescr->TcpSumStarts = 0; 821 + if (!IsTx) pDescr->TcpSumStarts = ETH_HLEN << 16 | ETH_HLEN; 822 822 823 823 /* advance one step */ 824 824 pPrevDescr = pDescr; ··· 2169 2169 } /* frame > SK_COPY_TRESHOLD */ 2170 2170 2171 2171 #ifdef USE_SK_RX_CHECKSUM 2172 - pMsg->csum = pRxd->TcpSums; 2172 + pMsg->csum = pRxd->TcpSums & 0xffff; 2173 2173 pMsg->ip_summed = CHECKSUM_HW; 2174 2174 #else 2175 2175 pMsg->ip_summed = CHECKSUM_NONE;