diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
| commit | 783e3385a134305d49d7b431df6e591265e7ec14 (patch) | |
| tree | 7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b /drivers/net | |
| parent | fd803241744ad6e4262b6588c6af89e8fb794098 (diff) | |
| parent | 1cf9e8a7865c0ac216034e519cf6b8505055ea50 (diff) | |
| download | kernel_samsung_aries-783e3385a134305d49d7b431df6e591265e7ec14.zip kernel_samsung_aries-783e3385a134305d49d7b431df6e591265e7ec14.tar.gz kernel_samsung_aries-783e3385a134305d49d7b431df6e591265e7ec14.tar.bz2 | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/pcnet32.c | 5 | ||||
| -rw-r--r-- | drivers/net/sk98lin/skge.c | 12 | ||||
| -rw-r--r-- | drivers/net/skge.c | 10 |
3 files changed, 13 insertions, 14 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 e3bdb58..e5591d3 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c @@ -815,7 +815,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; @@ -2163,10 +2163,12 @@ rx_start: skb_put(pMsg, FrameLength); } /* frame > SK_COPY_TRESHOLD */ - if (pRxPort->RxCsum) { - pMsg->csum = pRxd->TcpSums; - pMsg->ip_summed = CHECKSUM_HW; - } +#ifdef USE_SK_RX_CHECKSUM + pMsg->csum = pRxd->TcpSums & 0xffff; + pMsg->ip_summed = CHECKSUM_HW; +#else + pMsg->ip_summed = CHECKSUM_NONE; +#endif SK_DBG_MSG(NULL, SK_DBGMOD_DRV, 1,("V")); ForRlmt = SK_RLMT_RX_PROTOCOL; diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 7164678..8b6e2a1 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -2280,11 +2280,13 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev) } if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) { - netif_stop_queue(dev); - spin_unlock_irqrestore(&skge->tx_lock, flags); + if (!netif_stopped(dev)) { + netif_stop_queue(dev); - printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", - dev->name); + printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", + dev->name); + } + spin_unlock_irqrestore(&skge->tx_lock, flags); return NETDEV_TX_BUSY; } |