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

Commit 750b50ab authored by John W. Linville's avatar John W. Linville
Browse files

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

parents ab479995 70c07e02

Documentation/feature-removal-schedule.txt

+7 −0
Original line number Diff line number Diff line
@@ -151,6 +151,13 @@ Who: Ralf Baechle <ralf@linux-mips.org> 


---------------------------



What:   eepro100 network driver

When:   January 2007

Why:    replaced by the e100 driver

Who:    Adrian Bunk <bunk@stusta.de>



---------------------------



What:	Legacy /proc/pci interface (PCI_LEGACY_PROC)

When:	March 2006

Why:	deprecated since 2.5.53 in favor of lspci(8)

arch/ppc/platforms/hdpu.c

+2 −3
Original line number Diff line number Diff line
@@ -319,11 +319,10 @@ static void __init hdpu_fixup_eth_pdata(struct platform_device *pd) 
	struct mv643xx_eth_platform_data *eth_pd;

	eth_pd = pd->dev.platform_data;



	eth_pd->port_serial_control =

	    mv64x60_read(&bh, MV643XX_ETH_PORT_SERIAL_CONTROL_REG(pd->id) & ~1);



	eth_pd->force_phy_addr = 1;

	eth_pd->phy_addr = pd->id;

	eth_pd->speed = SPEED_100;

	eth_pd->duplex = DUPLEX_FULL;

	eth_pd->tx_queue_size = 400;

	eth_pd->rx_queue_size = 800;

}

drivers/net/3c523.c

+5 −4
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
#include <linux/mca-legacy.h>

#include <linux/ethtool.h>

#include <linux/bitops.h>

#include <linux/jiffies.h>



#include <asm/uaccess.h>

#include <asm/processor.h>
@@ -658,7 +659,7 @@ static int init586(struct net_device *dev) 


	s = jiffies;		/* warning: only active with interrupts on !! */

	while (!(cfg_cmd->cmd_status & STAT_COMPL)) {

		if (jiffies - s > 30*HZ/100)

		if (time_after(jiffies, s + 30*HZ/100))

			break;

	}
@@ -684,7 +685,7 @@ static int init586(struct net_device *dev) 


	s = jiffies;

	while (!(ias_cmd->cmd_status & STAT_COMPL)) {

		if (jiffies - s > 30*HZ/100)

		if (time_after(jiffies, s + 30*HZ/100))

			break;

	}
@@ -709,7 +710,7 @@ static int init586(struct net_device *dev) 


	s = jiffies;

	while (!(tdr_cmd->cmd_status & STAT_COMPL)) {

		if (jiffies - s > 30*HZ/100) {

		if (time_after(jiffies, s + 30*HZ/100)) {

			printk(KERN_WARNING "%s: %d Problems while running the TDR.\n", dev->name, __LINE__);

			result = 1;

			break;
@@ -798,7 +799,7 @@ static int init586(struct net_device *dev) 
			elmc_id_attn586();

			s = jiffies;

			while (!(mc_cmd->cmd_status & STAT_COMPL)) {

				if (jiffies - s > 30*HZ/100)

				if (time_after(jiffies, s + 30*HZ/100))

					break;

			}

			if (!(mc_cmd->cmd_status & STAT_COMPL)) {

drivers/net/3c59x.c

+2 −1
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ static int vortex_debug = 1; 
#include <linux/highmem.h>

#include <linux/eisa.h>

#include <linux/bitops.h>

#include <linux/jiffies.h>

#include <asm/irq.h>			/* For NR_IRQS only. */

#include <asm/io.h>

#include <asm/uaccess.h>
@@ -2724,7 +2725,7 @@ boomerang_rx(struct net_device *dev) 
			skb = dev_alloc_skb(PKT_BUF_SZ);

			if (skb == NULL) {

				static unsigned long last_jif;

				if ((jiffies - last_jif) > 10 * HZ) {

				if (time_after(jiffies, last_jif + 10 * HZ)) {

					printk(KERN_WARNING "%s: memory shortage\n", dev->name);

					last_jif = jiffies;

				}

drivers/net/7990.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/skbuff.h>

#include <linux/irq.h>

#include <asm/irq.h>

/* Used for the temporal inet entries and routing */

#include <linux/socket.h>

#include <linux/bitops.h>