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

Commit 0a4cf2c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  dsa: fix master interface allmulti/promisc handling
  dsa: fix skb->pkt_type when mac address of slave interface differs
  net: fix setting of skb->tail in skb_recycle_check()
  net: fix /proc/net/snmp as memory corruptor
  mac80211: fix a buffer overrun in station debug code
  netfilter: payload_len is be16, add size of struct rather than size of pointer
  ipv6: fix ip6_mr_init error path
  [4/4] dca: fixup initialization dependency
  [3/4] I/OAT: fix async_tx.callback checking
  [2/4] I/OAT: fix dma_pin_iovec_pages() error handling
  [1/4] I/OAT: fix channel resources free for not allocated channels
  ssb: Fix DMA-API compilation for non-PCI systems
  SSB: hide empty sub menu
  vlan: Fix typos in proc output string
  [netdrvr] usb/hso: Cleanup rfkill error handling
  sfc: Correct address of gPXE boot configuration in EEPROM
  el3_common_init() should be __devinit, not __init
  hso: rfkill type should be WWAN
  mlx4_en: Start port error flow bug fix
  af_key: mark policy as dead before destroying
parents 4694516d df02c6ff

drivers/dca/dca-core.c

+1 −1
Original line number Diff line number Diff line
@@ -270,6 +270,6 @@ static void __exit dca_exit(void) 
	dca_sysfs_exit();

}



module_init(dca_init);

subsys_initcall(dca_init);

module_exit(dca_exit);

drivers/dma/ioat_dma.c

+9 −2
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static dma_cookie_t ioat1_tx_submit(struct dma_async_tx_descriptor *tx) 
	}



	hw->ctl = IOAT_DMA_DESCRIPTOR_CTL_CP_STS;

	if (new->async_tx.callback) {

	if (first->async_tx.callback) {

		hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_INT_GN;

		if (first != new) {

			/* move callback into to last desc */
@@ -617,7 +617,7 @@ static dma_cookie_t ioat2_tx_submit(struct dma_async_tx_descriptor *tx) 
	}



	hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_CP_STS;

	if (new->async_tx.callback) {

	if (first->async_tx.callback) {

		hw->ctl |= IOAT_DMA_DESCRIPTOR_CTL_INT_GN;

		if (first != new) {

			/* move callback into to last desc */
@@ -807,6 +807,12 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan) 
	struct ioat_desc_sw *desc, *_desc;

	int in_use_descs = 0;



	/* Before freeing channel resources first check

	 * if they have been previously allocated for this channel.

	 */

	if (ioat_chan->desccount == 0)

		return;



	tasklet_disable(&ioat_chan->cleanup_task);

	ioat_dma_memcpy_cleanup(ioat_chan);
@@ -869,6 +875,7 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan) 
	ioat_chan->last_completion = ioat_chan->completion_addr = 0;

	ioat_chan->pending = 0;

	ioat_chan->dmacount = 0;

	ioat_chan->desccount = 0;

	ioat_chan->watchdog_completion = 0;

	ioat_chan->last_compl_desc_addr_hw = 0;

	ioat_chan->watchdog_tcp_cookie =

drivers/dma/iovlock.c

+6 −11
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) 
	int nr_iovecs = 0;

	int iovec_len_used = 0;

	int iovec_pages_used = 0;

	long err;



	/* don't pin down non-user-based iovecs */

	if (segment_eq(get_fs(), KERNEL_DS))
@@ -72,23 +71,21 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) 
	local_list = kmalloc(sizeof(*local_list)

		+ (nr_iovecs * sizeof (struct dma_page_list))

		+ (iovec_pages_used * sizeof (struct page*)), GFP_KERNEL);

	if (!local_list) {

		err = -ENOMEM;

	if (!local_list)

		goto out;

	}



	/* list of pages starts right after the page list array */

	pages = (struct page **) &local_list->page_list[nr_iovecs];



	local_list->nr_iovecs = 0;



	for (i = 0; i < nr_iovecs; i++) {

		struct dma_page_list *page_list = &local_list->page_list[i];



		len -= iov[i].iov_len;



		if (!access_ok(VERIFY_WRITE, iov[i].iov_base, iov[i].iov_len)) {

			err = -EFAULT;

		if (!access_ok(VERIFY_WRITE, iov[i].iov_base, iov[i].iov_len))

			goto unpin;

		}



		page_list->nr_pages = num_pages_spanned(&iov[i]);

		page_list->base_address = iov[i].iov_base;
@@ -109,10 +106,8 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) 
			NULL);

		up_read(&current->mm->mmap_sem);



		if (ret != page_list->nr_pages) {

			err = -ENOMEM;

		if (ret != page_list->nr_pages)

			goto unpin;

		}



		local_list->nr_iovecs = i + 1;

	}
@@ -122,7 +117,7 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) 
unpin:

	dma_unpin_iovec_pages(local_list);

out:

	return ERR_PTR(err);

	return NULL;

}



void dma_unpin_iovec_pages(struct dma_pinned_list *pinned_list)

drivers/net/mlx4/en_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static int mlx4_en_start_port(struct net_device *dev) 
	mlx4_en_release_rss_steer(priv);

rx_err:

	for (i = 0; i < priv->rx_ring_num; i++)

		mlx4_en_deactivate_rx_ring(priv, &priv->rx_ring[rx_index]);

		mlx4_en_deactivate_rx_ring(priv, &priv->rx_ring[i]);

cq_err:

	while (rx_index--)

		mlx4_en_deactivate_cq(priv, &priv->rx_cq[rx_index]);

drivers/net/sfc/ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = { 


/* EEPROM range with gPXE configuration */

#define EFX_ETHTOOL_EEPROM_MAGIC 0xEFAB

#define EFX_ETHTOOL_EEPROM_MIN 0x100U

#define EFX_ETHTOOL_EEPROM_MAX 0x400U

#define EFX_ETHTOOL_EEPROM_MIN 0x800U

#define EFX_ETHTOOL_EEPROM_MAX 0x1800U



/**************************************************************************

 *