Commit d002ec48 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [XFRM]: BEET mode
  [TCP]: Kill warning in tcp_clean_rtx_queue().
  [NET_SCHED]: Remove old estimator implementation
  [ATM]: [zatm] always *pcr in alloc_shaper()
  [ATM]: [ambassador] Change the return type to reflect reality
  [ATM]: kmalloc to kzalloc patches for drivers/atm
  [TIPC]: fix printk warning
  [XFRM]: Clearing xfrm_policy_count[] to zero during flush is incorrect.
  [XFRM] STATE: Use destination address for src hash.
  [NEIGH]: always use hash_mask under tbl lock
  [UDP]: Fix MSG_PROBE crash
  [UDP6]: Fix flowi clobbering
  [NET_SCHED]: Revert "HTB: fix incorrect use of RB_EMPTY_NODE"
  [NETFILTER]: ebt_mark: add or/and/xor action support to mark target
  [NETFILTER]: ipt_REJECT: remove largely duplicate route_reverse function
  [NETFILTER]: Honour source routing for LVS-NAT
  [NETFILTER]: add type parameter to ip_route_me_harder
  [NETFILTER]: Kconfig: fix xt_physdev dependencies
parents 5a96c5d0 0a69452c

drivers/atm/adummy.c

+2 −4
Original line number Diff line number Diff line
@@ -113,15 +113,13 @@ static int __init adummy_init(void) 


	printk(KERN_ERR "adummy: version %s\n", DRV_VERSION);



	adummy_dev = (struct adummy_dev *) kmalloc(sizeof(struct adummy_dev),

	adummy_dev = kzalloc(sizeof(struct adummy_dev),

						   GFP_KERNEL);

	if (!adummy_dev) {

		printk(KERN_ERR DEV_LABEL ": kmalloc() failed\n");

		printk(KERN_ERR DEV_LABEL ": kzalloc() failed\n");

		err = -ENOMEM;

		goto out;

	}

	memset(adummy_dev, 0, sizeof(struct adummy_dev));



	atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL);

	if (!atm_dev) {

		printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");

drivers/atm/ambassador.c

+2 −2
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id, 


/********** make rate (not quite as much fun as Horizon) **********/



static unsigned int make_rate (unsigned int rate, rounding r,

static int make_rate (unsigned int rate, rounding r,

		      u16 * bits, unsigned int * actual) {

  unsigned char exp = -1; // hush gcc

  unsigned int man = -1;  // hush gcc

drivers/atm/firestream.c

+3 −9
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ static int __devinit fs_init (struct fs_dev *dev) 
		write_fs (dev, RAM, (1 << (28 - FS155_VPI_BITS - FS155_VCI_BITS)) - 1);

		dev->nchannels = FS155_NR_CHANNELS;

	}

	dev->atm_vccs = kmalloc (dev->nchannels * sizeof (struct atm_vcc *), 

	dev->atm_vccs = kcalloc (dev->nchannels, sizeof (struct atm_vcc *),

				 GFP_KERNEL);

	fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%Zd)\n",

		    dev->atm_vccs, dev->nchannels * sizeof (struct atm_vcc *));
@@ -1794,9 +1794,8 @@ static int __devinit fs_init (struct fs_dev *dev) 
		/* XXX Clean up..... */

		return 1;

	}

	memset (dev->atm_vccs, 0, dev->nchannels * sizeof (struct atm_vcc *));



	dev->tx_inuse = kmalloc (dev->nchannels / 8 /* bits/byte */ , GFP_KERNEL);

	dev->tx_inuse = kzalloc (dev->nchannels / 8 /* bits/byte */ , GFP_KERNEL);

	fs_dprintk (FS_DEBUG_ALLOC, "Alloc tx_inuse: %p(%d)\n", 

		    dev->atm_vccs, dev->nchannels / 8);
@@ -1805,8 +1804,6 @@ static int __devinit fs_init (struct fs_dev *dev) 
		/* XXX Clean up..... */

		return 1;

	}

	memset (dev->tx_inuse, 0, dev->nchannels / 8);



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

	/* -- RAS2 : FS50 only: Default is OK. */
@@ -1893,14 +1890,11 @@ static int __devinit firestream_init_one (struct pci_dev *pci_dev, 
	if (pci_enable_device(pci_dev)) 

		goto err_out;



	fs_dev = kmalloc (sizeof (struct fs_dev), GFP_KERNEL);

	fs_dev = kzalloc (sizeof (struct fs_dev), GFP_KERNEL);

	fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%Zd)\n",

		    fs_dev, sizeof (struct fs_dev));

	if (!fs_dev)

		goto err_out;



	memset (fs_dev, 0, sizeof (struct fs_dev));

  

	atm_dev = atm_dev_register("fs", &ops, -1, NULL);

	if (!atm_dev)

		goto err_out_free_fs_dev;

drivers/atm/he.c

+1 −3
Original line number Diff line number Diff line
@@ -383,14 +383,12 @@ he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent) 
	}

	pci_set_drvdata(pci_dev, atm_dev);



	he_dev = (struct he_dev *) kmalloc(sizeof(struct he_dev),

	he_dev = kzalloc(sizeof(struct he_dev),

							GFP_KERNEL);

	if (!he_dev) {

		err = -ENOMEM;

		goto init_one_failure;

	}

	memset(he_dev, 0, sizeof(struct he_dev));



	he_dev->pci_dev = pci_dev;

	he_dev->atm_dev = atm_dev;

	he_dev->atm_dev->dev_data = he_dev;

drivers/atm/horizon.c

+1 −3
Original line number Diff line number Diff line
@@ -2719,7 +2719,7 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_ 
		goto out_disable;

	}



	dev = kmalloc(sizeof(hrz_dev), GFP_KERNEL);

	dev = kzalloc(sizeof(hrz_dev), GFP_KERNEL);

	if (!dev) {

		// perhaps we should be nice: deregister all adapters and abort?

		PRINTD(DBG_ERR, "out of memory");
@@ -2727,8 +2727,6 @@ static int __devinit hrz_probe(struct pci_dev *pci_dev, const struct pci_device_ 
		goto out_release;

	}



	memset(dev, 0, sizeof(hrz_dev));



	pci_set_drvdata(pci_dev, dev);



	// grab IRQ and install handler - move this someplace more sensible

CRA Git | Maintained and supported by SUSTech CRA and CCSE