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

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

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

parents 30df754d 84c0c693

Documentation/networking/bonding.txt

+17 −9
Original line number Diff line number Diff line
@@ -2561,15 +2561,12 @@ enslaved. 
	The latest version of the bonding driver can be found in the latest

version of the linux kernel, found on http://kernel.org



The latest version of this document can be found in either the latest

kernel source (named Documentation/networking/bonding.txt), or on the

bonding sourceforge site:

	The latest version of this document can be found in the latest kernel

source (named Documentation/networking/bonding.txt).



http://www.sourceforge.net/projects/bonding



Discussions regarding the bonding driver take place primarily on the

bonding-devel mailing list, hosted at sourceforge.net.  If you have

questions or problems, post them to the list.  The list address is:

	Discussions regarding the usage of the bonding driver take place on the

bonding-devel mailing list, hosted at sourceforge.net. If you have questions or

problems, post them to the list.  The list address is:



bonding-devel@lists.sourceforge.net
@@ -2578,6 +2575,17 @@ be found at: 


https://lists.sourceforge.net/lists/listinfo/bonding-devel



	Discussions regarding the developpement of the bonding driver take place

on the main Linux network mailing list, hosted at vger.kernel.org. The list

address is:



netdev@vger.kernel.org



	The administrative interface (to subscribe or unsubscribe) can

be found at:



http://vger.kernel.org/vger-lists.html#netdev



Donald Becker's Ethernet Drivers and diag programs may be found at :

 - http://web.archive.org/web/*/http://www.scyld.com/network/

drivers/net/ariadne.c

+0 −5
Original line number Diff line number Diff line
@@ -425,11 +425,6 @@ static irqreturn_t ariadne_interrupt(int irq, void *data) 
    int csr0, boguscnt;

    int handled = 0;



    if (dev == NULL) {

	printk(KERN_WARNING "ariadne_interrupt(): irq for unknown device.\n");

	return IRQ_NONE;

    }



    lance->RAP = CSR0;			/* PCnet-ISA Controller Status */



    if (!(lance->RDP & INTR))		/* Check if any interrupt has been */

drivers/net/bnx2x/bnx2x_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4229,7 +4229,7 @@ void bnx2x_update_coalesce(struct bnx2x *bp) 


	for_each_eth_queue(bp, i)

		bnx2x_update_coalesce_sb(bp, bp->fp[i].fw_sb_id,

					 bp->rx_ticks, bp->tx_ticks);

					 bp->tx_ticks, bp->rx_ticks);

}



static void bnx2x_init_sp_ring(struct bnx2x *bp)

drivers/net/can/usb/esd_usb2.c

+3 −3
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ static int esd_usb2_start(struct esd_usb2_net_priv *priv) 
static void unlink_all_urbs(struct esd_usb2 *dev)

{

	struct esd_usb2_net_priv *priv;

	int i;

	int i, j;



	usb_kill_anchored_urbs(&dev->rx_submitted);

	for (i = 0; i < dev->net_count; i++) {
@@ -668,8 +668,8 @@ static void unlink_all_urbs(struct esd_usb2 *dev) 
			usb_kill_anchored_urbs(&priv->tx_submitted);

			atomic_set(&priv->active_tx_jobs, 0);



			for (i = 0; i < MAX_TX_URBS; i++)

				priv->tx_contexts[i].echo_index = MAX_TX_URBS;

			for (j = 0; j < MAX_TX_URBS; j++)

				priv->tx_contexts[j].echo_index = MAX_TX_URBS;

		}

	}

}

drivers/net/davinci_emac.c

+1 −1
Original line number Diff line number Diff line
@@ -1730,7 +1730,7 @@ static struct net_device_stats *emac_dev_getnetstats(struct net_device *ndev) 
		emac_read(EMAC_TXCARRIERSENSE);

	emac_write(EMAC_TXCARRIERSENSE, stats_clear_mask);



	ndev->stats.tx_fifo_errors = emac_read(EMAC_TXUNDERRUN);

	ndev->stats.tx_fifo_errors += emac_read(EMAC_TXUNDERRUN);

	emac_write(EMAC_TXUNDERRUN, stats_clear_mask);



	return &ndev->stats;