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

Commit 65f42886 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:
  ipv4/route.c: respect prefsrc for local routes
  bridge: stp: ensure mac header is set
  bridge: fix br_multicast_ipv6_rcv for paged skbs
  atl1: fix oops when changing tx/rx ring params
  drivers/atm/atmtcp.c: add missing atm_dev_put
  starfire: Fix dma_addr_t size test for MIPS
  tg3: fix return value check in tg3_read_vpd()
  Broadcom CNIC core network driver: fix mem leak on allocation failures in cnic_alloc_uio_rings()
  ISDN, Gigaset: Fix memory leak in do_disconnect_req()
  CAN: Use inode instead of kernel address for /proc file
  skfp: testing the wrong variable in skfp_driver_init()
  ppp: allow disabling multilink protocol ID compression
  ehea: Avoid changing vlan flags
  ueagle-atm: fix PHY signal initialization race
parents 8a87694e 9fc3bbb4

drivers/atm/atmtcp.c

+4 −1
Original line number Diff line number Diff line
@@ -392,7 +392,10 @@ static int atmtcp_attach(struct atm_vcc *vcc,int itf) 
			atm_dev_put(dev);

			return -EMEDIUMTYPE;

		}

		if (PRIV(dev)->vcc) return -EBUSY;

		if (PRIV(dev)->vcc) {

			atm_dev_put(dev);

			return -EBUSY;

		}

	}

	else {

		int error;

drivers/isdn/gigaset/capi.c

+1 −0
Original line number Diff line number Diff line
@@ -1900,6 +1900,7 @@ static void do_disconnect_req(struct gigaset_capi_ctr *iif, 
		if (b3skb == NULL) {

			dev_err(cs->dev, "%s: out of memory\n", __func__);

			send_conf(iif, ap, skb, CAPI_MSGOSRESOURCEERR);

			kfree(b3cmsg);

			return;

		}

		capi_cmsg2message(b3cmsg,

drivers/net/atlx/atl1.c

+10 −0
Original line number Diff line number Diff line
@@ -3504,6 +3504,8 @@ static int atl1_set_ringparam(struct net_device *netdev, 
	struct atl1_rfd_ring rfd_old, rfd_new;

	struct atl1_rrd_ring rrd_old, rrd_new;

	struct atl1_ring_header rhdr_old, rhdr_new;

	struct atl1_smb smb;

	struct atl1_cmb cmb;

	int err;



	tpd_old = adapter->tpd_ring;
@@ -3544,11 +3546,19 @@ static int atl1_set_ringparam(struct net_device *netdev, 
		adapter->rrd_ring = rrd_old;

		adapter->tpd_ring = tpd_old;

		adapter->ring_header = rhdr_old;

		/*

		 * Save SMB and CMB, since atl1_free_ring_resources

		 * will clear them.

		 */

		smb = adapter->smb;

		cmb = adapter->cmb;

		atl1_free_ring_resources(adapter);

		adapter->rfd_ring = rfd_new;

		adapter->rrd_ring = rrd_new;

		adapter->tpd_ring = tpd_new;

		adapter->ring_header = rhdr_new;

		adapter->smb = smb;

		adapter->cmb = cmb;



		err = atl1_up(adapter);

		if (err)

drivers/net/cnic.c

+8 −2
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) 
					   &udev->l2_ring_map,

					   GFP_KERNEL | __GFP_COMP);

	if (!udev->l2_ring)

		return -ENOMEM;

		goto err_udev;



	udev->l2_buf_size = (cp->l2_rx_ring_size + 1) * cp->l2_single_buf_size;

	udev->l2_buf_size = PAGE_ALIGN(udev->l2_buf_size);
@@ -948,7 +948,7 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) 
					  &udev->l2_buf_map,

					  GFP_KERNEL | __GFP_COMP);

	if (!udev->l2_buf)

		return -ENOMEM;

		goto err_dma;



	write_lock(&cnic_dev_lock);

	list_add(&udev->list, &cnic_udev_list);
@@ -959,6 +959,12 @@ static int cnic_alloc_uio_rings(struct cnic_dev *dev, int pages) 
	cp->udev = udev;



	return 0;

 err_dma:

	dma_free_coherent(&udev->pdev->dev, udev->l2_ring_size,

			  udev->l2_ring, udev->l2_ring_map);

 err_udev:

	kfree(udev);

	return -ENOMEM;

}



static int cnic_init_uio(struct cnic_dev *dev)

drivers/net/ehea/ehea_ethtool.c

+7 −0
Original line number Diff line number Diff line
@@ -263,6 +263,13 @@ static void ehea_get_ethtool_stats(struct net_device *dev, 


static int ehea_set_flags(struct net_device *dev, u32 data)

{

	/* Avoid changing the VLAN flags */

	if ((data & (ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN)) !=

	    (ethtool_op_get_flags(dev) & (ETH_FLAG_RXVLAN |

					  ETH_FLAG_TXVLAN))){

		return -EINVAL;

	}



	return ethtool_op_set_flags(dev, data, ETH_FLAG_LRO

					| ETH_FLAG_TXVLAN

					| ETH_FLAG_RXVLAN);