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

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

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

parents b635acec c0912585

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ config ETH16I 


config NE2000

	tristate "NE2000/NE1000 support"

	depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938

	depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX

	select CRC32

	---help---

	  If you have a network (Ethernet) card of this type, say Y and read

drivers/net/acenic.c

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 


#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/version.h>

#include <linux/types.h>

#include <linux/errno.h>

#include <linux/ioport.h>

drivers/net/arm/ixp4xx_eth.c

+3 −3
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ static int eth_poll(struct napi_struct *napi, int budget) 
		if ((skb = netdev_alloc_skb(dev, RX_BUFF_SIZE))) {

			phys = dma_map_single(&dev->dev, skb->data,

					      RX_BUFF_SIZE, DMA_FROM_DEVICE);

			if (dma_mapping_error(phys)) {

			if (dma_mapping_error(&dev->dev, phys)) {

				dev_kfree_skb(skb);

				skb = NULL;

			}
@@ -698,7 +698,7 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev) 
#endif



	phys = dma_map_single(&dev->dev, mem, bytes, DMA_TO_DEVICE);

	if (dma_mapping_error(phys)) {

	if (dma_mapping_error(&dev->dev, phys)) {

#ifdef __ARMEB__

		dev_kfree_skb(skb);

#else
@@ -883,7 +883,7 @@ static int init_queues(struct port *port) 
		desc->buf_len = MAX_MRU;

		desc->data = dma_map_single(&port->netdev->dev, data,

					    RX_BUFF_SIZE, DMA_FROM_DEVICE);

		if (dma_mapping_error(desc->data)) {

		if (dma_mapping_error(&port->netdev->dev, desc->data)) {

			free_buffer(buff);

			return -EIO;

		}

drivers/net/atl1e/atl1e_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static int atl1e_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	struct atl1e_adapter *adapter = netdev_priv(netdev);



	if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE |

			    WAKE_MCAST | WAKE_BCAST | WAKE_MCAST))

			    WAKE_UCAST | WAKE_MCAST | WAKE_BCAST))

		return -EOPNOTSUPP;

	/* these settings will always override what we currently have */

	adapter->wol = 0;

drivers/net/au1000_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ static struct net_device * au1000_probe(int port_num) 
static int au1000_init(struct net_device *dev)

{

	struct au1000_private *aup = (struct au1000_private *) dev->priv;

	u32 flags;

	unsigned long flags;

	int i;

	u32 control;