Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (6332178d) · Commits · e / devices / android_kernel_teracube_2e

drivers/net/bnx2.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -547,9 +547,9 @@ bnx2_free_rx_mem(struct bnx2 *bp)
	for (j = 0; j < bp->rx_max_pg_ring; j++) {		for (j = 0; j < bp->rx_max_pg_ring; j++) {
	if (rxr->rx_pg_desc_ring[j])		if (rxr->rx_pg_desc_ring[j])
	pci_free_consistent(bp->pdev, RXBD_RING_SIZE,		pci_free_consistent(bp->pdev, RXBD_RING_SIZE,
	rxr->rx_pg_desc_ring[i],		rxr->rx_pg_desc_ring[j],
	rxr->rx_pg_desc_mapping[i]);		rxr->rx_pg_desc_mapping[j]);
	rxr->rx_pg_desc_ring[i] = NULL;		rxr->rx_pg_desc_ring[j] = NULL;
	}		}
	if (rxr->rx_pg_ring)		if (rxr->rx_pg_ring)
	vfree(rxr->rx_pg_ring);		vfree(rxr->rx_pg_ring);

drivers/net/jme.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@
	*/		*/

	#ifndef __JME_H_INCLUDED__		#ifndef __JME_H_INCLUDED__
	#define __JME_H_INCLUDEE__		#define __JME_H_INCLUDED__

	#define DRV_NAME "jme"		#define DRV_NAME "jme"
	#define DRV_VERSION "1.0.3"		#define DRV_VERSION "1.0.3"

drivers/net/phy/mdio_bus.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -105,8 +105,6 @@ int mdiobus_register(struct mii_bus *bus)
	return -EINVAL;		return -EINVAL;
	}		}

	bus->state = MDIOBUS_REGISTERED;

	mutex_init(&bus->mdio_lock);		mutex_init(&bus->mdio_lock);

	if (bus->reset)		if (bus->reset)
	@@ -123,6 +121,9 @@ int mdiobus_register(struct mii_bus *bus)
	}		}
	}		}

			if (!err)
			bus->state = MDIOBUS_REGISTERED;

	pr_info("%s: probed\n", bus->name);		pr_info("%s: probed\n", bus->name);

	return err;		return err;

drivers/net/ppp_generic.c

+13 −15

Original line number	Original line	Diff line number	Diff line
	@@ -117,6 +117,7 @@ struct ppp {
	unsigned long last_xmit; /* jiffies when last pkt sent 9c */		unsigned long last_xmit; /* jiffies when last pkt sent 9c */
	unsigned long last_recv; /* jiffies when last pkt rcvd a0 */		unsigned long last_recv; /* jiffies when last pkt rcvd a0 */
	struct net_device dev; / network interface device a4 */		struct net_device dev; / network interface device a4 */
			int closing; /* is device closing down? a8 */
	#ifdef CONFIG_PPP_MULTILINK		#ifdef CONFIG_PPP_MULTILINK
	int nxchan; /* next channel to send something on */		int nxchan; /* next channel to send something on */
	u32 nxseq; /* next sequence number to send */		u32 nxseq; /* next sequence number to send */
	@@ -983,7 +984,7 @@ ppp_xmit_process(struct ppp *ppp)
	struct sk_buff *skb;		struct sk_buff *skb;

	ppp_xmit_lock(ppp);		ppp_xmit_lock(ppp);
	if (ppp->dev) {		if (!ppp->closing) {
	ppp_push(ppp);		ppp_push(ppp);
	while (!ppp->xmit_pending		while (!ppp->xmit_pending
	&& (skb = skb_dequeue(&ppp->file.xq)))		&& (skb = skb_dequeue(&ppp->file.xq)))
	@@ -1451,8 +1452,7 @@ static inline void
	ppp_do_recv(struct ppp ppp, struct sk_buff skb, struct channel *pch)		ppp_do_recv(struct ppp ppp, struct sk_buff skb, struct channel *pch)
	{		{
	ppp_recv_lock(ppp);		ppp_recv_lock(ppp);
	/* ppp->dev == 0 means interface is closing down */		if (!ppp->closing)
	if (ppp->dev)
	ppp_receive_frame(ppp, skb, pch);		ppp_receive_frame(ppp, skb, pch);
	else		else
	kfree_skb(skb);		kfree_skb(skb);
	@@ -2484,18 +2484,16 @@ init_ppp_file(struct ppp_file *pf, int kind)
	*/		*/
	static void ppp_shutdown_interface(struct ppp *ppp)		static void ppp_shutdown_interface(struct ppp *ppp)
	{		{
	struct net_device *dev;

	mutex_lock(&all_ppp_mutex);		mutex_lock(&all_ppp_mutex);
			/* This will call dev_close() for us. */
	ppp_lock(ppp);		ppp_lock(ppp);
	dev = ppp->dev;		if (!ppp->closing) {
	ppp->dev = NULL;		ppp->closing = 1;
	ppp_unlock(ppp);		ppp_unlock(ppp);
	/* This will call dev_close() for us. */		unregister_netdev(ppp->dev);
	if (dev) {		} else
	unregister_netdev(dev);		ppp_unlock(ppp);
	free_netdev(dev);
	}
	unit_put(&ppp_units_idr, ppp->file.index);		unit_put(&ppp_units_idr, ppp->file.index);
	ppp->file.dead = 1;		ppp->file.dead = 1;
	ppp->owner = NULL;		ppp->owner = NULL;
	@@ -2540,7 +2538,7 @@ static void ppp_destroy_interface(struct ppp *ppp)
	if (ppp->xmit_pending)		if (ppp->xmit_pending)
	kfree_skb(ppp->xmit_pending);		kfree_skb(ppp->xmit_pending);

	kfree(ppp);		free_netdev(ppp->dev);
	}		}

	/*		/*
	@@ -2602,7 +2600,7 @@ ppp_connect_channel(struct channel *pch, int unit)
	if (pch->file.hdrlen > ppp->file.hdrlen)		if (pch->file.hdrlen > ppp->file.hdrlen)
	ppp->file.hdrlen = pch->file.hdrlen;		ppp->file.hdrlen = pch->file.hdrlen;
	hdrlen = pch->file.hdrlen + 2; /* for protocol bytes */		hdrlen = pch->file.hdrlen + 2; /* for protocol bytes */
	if (ppp->dev && hdrlen > ppp->dev->hard_header_len)		if (hdrlen > ppp->dev->hard_header_len)
	ppp->dev->hard_header_len = hdrlen;		ppp->dev->hard_header_len = hdrlen;
	list_add_tail(&pch->clist, &ppp->channels);		list_add_tail(&pch->clist, &ppp->channels);
	++ppp->n_channels;		++ppp->n_channels;

drivers/net/starfire.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1503,6 +1503,11 @@ static int __netdev_rx(struct net_device dev, int quota)
	desc->status = 0;		desc->status = 0;
	np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE;		np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE;
	}		}

			if (quota == 0) { / out of rx quota */
			retcode = 1;
			goto out;
			}
	writew(np->rx_done, np->base + CompletionQConsumerIdx);		writew(np->rx_done, np->base + CompletionQConsumerIdx);

	out:		out: