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

Commit 485cf925 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (24 commits)
  [NETFILTER]: xt_connlimit needs to depend on nf_conntrack
  [NETFILTER]: ipt_iprange.h must #include <linux/types.h>
  [IrDA]: Fix IrDA build failure
  [ATM]: nicstar needs virt_to_bus
  [NET]: move __dev_addr_discard adjacent to dev_addr_discard for readability
  [NET]: merge dev_unicast_discard and dev_mc_discard into one
  [NET]: move dev_mc_discard from dev_mcast.c to dev.c
  [NETLINK]: negative groups in netlink_setsockopt
  [PPPOL2TP]: Reset meta-data in xmit function
  [PPPOL2TP]: Fix use-after-free
  [PKT_SCHED]: Some typo fixes in net/sched/Kconfig
  [XFRM]: Fix crash introduced by struct dst_entry reordering
  [TCP]: remove unused argument to cong_avoid op
  [ATM]: [idt77252] Rename CONFIG_ATM_IDT77252_SEND_IDLE to not resemble a Kconfig variable
  [ATM]: [drivers] ioremap balanced with iounmap
  [ATM]: [lanai] sram_test_word() must be __devinit
  [ATM]: [nicstar] Replace C code with call to ARRAY_SIZE() macro.
  [ATM]: Eliminate dead config variable CONFIG_BR2684_FAST_TRANS.
  [ATM]: Replacing kmalloc/memset combination with kzalloc.
  [NET]: gen_estimator deadlock fix
  ...
parents 31bdc5dc 3fd8f9e4

drivers/atm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ config ATM_ZATM_DEBUG 


config ATM_NICSTAR

	tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"

	depends on PCI && !64BIT

	depends on PCI && !64BIT && VIRT_TO_BUS

	help

	  The NICStAR chipset family is used in a large number of ATM NICs for

	  25 and for 155 Mbps, including IDT cards and the Fore ForeRunnerLE

drivers/atm/eni.c

+15 −4
Original line number Diff line number Diff line
@@ -1738,7 +1738,8 @@ static int __devinit eni_do_init(struct atm_dev *dev) 
			printk(KERN_ERR KERN_ERR DEV_LABEL "(itf %d): bad "

			    "magic - expected 0x%x, got 0x%x\n",dev->number,

			    ENI155_MAGIC,(unsigned) readl(&eprom->magic));

			return -EINVAL;

			error = -EINVAL;

			goto unmap;

		}

	}

	eni_dev->phy = base+PHY_BASE;
@@ -1765,17 +1766,27 @@ static int __devinit eni_do_init(struct atm_dev *dev) 
		printk(")\n");

		printk(KERN_ERR DEV_LABEL "(itf %d): ERROR - wrong id 0x%x\n",

		    dev->number,(unsigned) eni_in(MID_RES_ID_MCON));

		return -EINVAL;

		error = -EINVAL;

		goto unmap;

	}

	error = eni_dev->asic ? get_esi_asic(dev) : get_esi_fpga(dev,base);

	if (error) return error;

	if (error)

		goto unmap;

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

		printk("%s%02X",i ? "-" : "",dev->esi[i]);

	printk(")\n");

	printk(KERN_NOTICE DEV_LABEL "(itf %d): %s,%s\n",dev->number,

	    eni_in(MID_RES_ID_MCON) & 0x200 ? "ASIC" : "FPGA",

	    media_name[eni_in(MID_RES_ID_MCON) & DAUGTHER_ID]);

	return suni_init(dev);



	error = suni_init(dev);

	if (error)

		goto unmap;

out:

	return error;

unmap:

	iounmap(base);

	goto out;

}

drivers/atm/firestream.c

+9 −5
Original line number Diff line number Diff line
@@ -1710,7 +1710,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
		/* This bit is documented as "RESERVED" */

		if (isr & ISR_INIT_ERR) {

			printk (KERN_ERR "Error initializing the FS... \n");

			return 1;

			goto unmap;

		}

		if (isr & ISR_INIT) {

			fs_dprintk (FS_DEBUG_INIT, "Ha! Initialized OK!\n");
@@ -1723,7 +1723,7 @@ static int __devinit fs_init (struct fs_dev *dev) 


	if (!to) {

		printk (KERN_ERR "timeout initializing the FS... \n");

		return 1;

		goto unmap;

	}



	/* XXX fix for fs155 */
@@ -1803,7 +1803,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
	if (!dev->atm_vccs) {

		printk (KERN_WARNING "Couldn't allocate memory for VCC buffers. Woops!\n");

		/* XXX Clean up..... */

		return 1;

		goto unmap;

	}



	dev->tx_inuse = kzalloc (dev->nchannels / 8 /* bits/byte */ , GFP_KERNEL);
@@ -1813,7 +1813,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
	if (!dev->tx_inuse) {

		printk (KERN_WARNING "Couldn't allocate memory for tx_inuse bits!\n");

		/* XXX Clean up..... */

		return 1;

		goto unmap;

	}

	/* -- RAS1 : FS155 and 50 differ. Default (0) should be OK for both */

	/* -- RAS2 : FS50 only: Default is OK. */
@@ -1840,7 +1840,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
	if (request_irq (dev->irq, fs_irq, IRQF_SHARED, "firestream", dev)) {

		printk (KERN_WARNING "couldn't get irq %d for firestream.\n", pci_dev->irq);

		/* XXX undo all previous stuff... */

		return 1;

		goto unmap;

	}

	fs_dprintk (FS_DEBUG_INIT, "Grabbed irq %d for dev at %p.\n", dev->irq, dev);
@@ -1890,6 +1890,9 @@ static int __devinit fs_init (struct fs_dev *dev) 
  

	func_exit ();

	return 0;

unmap:

	iounmap(dev->base);

	return 1;

}



static int __devinit firestream_init_one (struct pci_dev *pci_dev,
@@ -2012,6 +2015,7 @@ static void __devexit firestream_remove_one (struct pci_dev *pdev) 
		for (i=0;i < FS_NR_RX_QUEUES;i++)

			free_queue (dev, &dev->rx_rq[i]);



		iounmap(dev->base);

		fs_dprintk (FS_DEBUG_ALLOC, "Free fs-dev: %p\n", dev);

		nxtdev = dev->next;

		kfree (dev);

drivers/atm/idt77252.c

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static char const rcsid[] = 
static unsigned int vpibits = 1;





#define CONFIG_ATM_IDT77252_SEND_IDLE 1

#define ATM_IDT77252_SEND_IDLE 1





/*
@@ -3404,7 +3404,7 @@ init_card(struct atm_dev *dev) 
	conf =	SAR_CFG_TX_FIFO_SIZE_9 |	/* Use maximum fifo size */

		SAR_CFG_RXSTQ_SIZE_8k |		/* Receive Status Queue is 8k */

		SAR_CFG_IDLE_CLP |		/* Set CLP on idle cells */

#ifndef CONFIG_ATM_IDT77252_SEND_IDLE

#ifndef ATM_IDT77252_SEND_IDLE

		SAR_CFG_NO_IDLE |		/* Do not send idle cells */

#endif

		0;
@@ -3541,7 +3541,7 @@ init_card(struct atm_dev *dev) 
	printk("%s: Linkrate on ATM line : %u bit/s, %u cell/s.\n",

	       card->name, linkrate, card->link_pcr);



#ifdef CONFIG_ATM_IDT77252_SEND_IDLE

#ifdef ATM_IDT77252_SEND_IDLE

	card->utopia_pcr = card->link_pcr;

#else

	card->utopia_pcr = (160000000 / 8 / 54);

drivers/atm/lanai.c

+2 −2
Original line number Diff line number Diff line
@@ -552,8 +552,8 @@ static inline void sram_write(const struct lanai_dev *lanai, 
	writel(val, sram_addr(lanai, offset));

}



static int __init sram_test_word(

	const struct lanai_dev *lanai, int offset, u32 pattern)

static int __devinit sram_test_word(const struct lanai_dev *lanai,

				    int offset, u32 pattern)

{

	u32 readback;

	sram_write(lanai, pattern, offset);