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

Commit 8b91ac09 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 8aca6cb1 56997fa8

drivers/net/atlx/atl1.c

+1 −0
Original line number Diff line number Diff line
@@ -2023,6 +2023,7 @@ static void atl1_intr_rx(struct atl1_adapter *adapter) 
		/* Good Receive */

		pci_unmap_page(adapter->pdev, buffer_info->dma,

			       buffer_info->length, PCI_DMA_FROMDEVICE);

		buffer_info->dma = 0;

		skb = buffer_info->skb;

		length = le16_to_cpu(rrd->xsz.xsum_sz.pkt_size);

drivers/net/cs89x0.c

+7 −3
Original line number Diff line number Diff line
@@ -1394,6 +1394,10 @@ net_open(struct net_device *dev) 
#endif

        if (!result) {

                printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name);

release_dma:

#if ALLOW_DMA

		free_dma(dev->dma);

#endif

release_irq:

#if ALLOW_DMA

		release_dma_buff(lp);
@@ -1442,12 +1446,12 @@ net_open(struct net_device *dev) 
			if ((result = detect_bnc(dev)) != DETECTED_NONE)

				break;

		printk(KERN_ERR "%s: no media detected\n", dev->name);

                goto release_irq;

		goto release_dma;

	}

	switch(result) {

	case DETECTED_NONE:

		printk(KERN_ERR "%s: no network cable attached to configured media\n", dev->name);

                goto release_irq;

		goto release_dma;

	case DETECTED_RJ45H:

		printk(KERN_INFO "%s: using half-duplex 10Base-T (RJ-45)\n", dev->name);

		break;

drivers/net/myri10ge/myri10ge.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
#include "myri10ge_mcp.h"

#include "myri10ge_mcp_gen_header.h"



#define MYRI10GE_VERSION_STR "1.3.2-1.287"

#define MYRI10GE_VERSION_STR "1.3.99-1.347"



MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");

MODULE_AUTHOR("Maintainer: help@myri.com");

drivers/net/sc92031.c

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ static int sc92031_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	skb_copy_and_csum_dev(skb, priv->tx_bufs + entry * TX_BUF_SIZE);



	len = skb->len;

	if (unlikely(len < ETH_ZLEN)) {

	if (len < ETH_ZLEN) {

		memset(priv->tx_bufs + entry * TX_BUF_SIZE + len,

				0, ETH_ZLEN - len);

		len = ETH_ZLEN;

drivers/net/sfc/falcon_xmac.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static int falcon_check_xaui_link_up(struct efx_nic *efx) 
		tries--;

	}



	EFX_ERR(efx, "Failed to bring XAUI link back up in %d tries!\n",

	EFX_LOG(efx, "Failed to bring XAUI link back up in %d tries!\n",

		max_tries);

	return 0;

}