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

Documentation/filesystems/proc.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -1478,6 +1478,13 @@ of problems on the network like duplicate address or bad checksums. Normally,
		this should be enabled, but if the problem persists the messages can be
		disabled.

		netdev_budget
		-------------

		Maximum number of packets taken from all interfaces in one polling cycle (NAPI
		poll). In one polling cycle interfaces which are registered to polling are
		probed in a round-robin manner. The limit of packets in one such probe can be
		set per-device via sysfs class/net/<device>/weight .

		netdev_max_backlog
		------------------

drivers/isdn/gigaset/bas-gigaset.c

+13 −3

Original line number	Diff line number	Diff line
		@@ -46,6 +46,9 @@ MODULE_PARM_DESC(cidmode, "Call-ID mode");
		/* length limit according to Siemens 3070usb-protokoll.doc ch. 2.1 */
		#define IF_WRITEBUF 264

		/* interrupt pipe message size according to ibid. ch. 2.2 */
		#define IP_MSGSIZE 3

		/* Values for the Gigaset 307x */
		#define USB_GIGA_VENDOR_ID 0x0681
		#define USB_3070_PRODUCT_ID 0x0001
		@@ -110,7 +113,7 @@ struct bas_cardstate {
		unsigned char rcvbuf; / AT reply receive buffer */

		struct urb urb_int_in; / URB for interrupt pipe */
		unsigned char int_in_buf[3];
		unsigned char *int_in_buf;

		spinlock_t lock; /* locks all following */
		int basstate; /* bitmap (BS_) /
		@@ -657,7 +660,7 @@ static void read_int_callback(struct urb *urb)
		}

		/* drop incomplete packets even if the missing bytes wouldn't matter */
		if (unlikely(urb->actual_length < 3)) {
		if (unlikely(urb->actual_length < IP_MSGSIZE)) {
		dev_warn(cs->dev, "incomplete interrupt packet (%d bytes)\n",
		urb->actual_length);
		goto resubmit;
		@@ -2127,6 +2130,7 @@ static void gigaset_reinitbcshw(struct bc_state *bcs)
		static void gigaset_freecshw(struct cardstate *cs)
		{
		/* timers, URBs and rcvbuf are disposed of in disconnect */
		kfree(cs->hw.bas->int_in_buf);
		kfree(cs->hw.bas);
		cs->hw.bas = NULL;
		}
		@@ -2140,6 +2144,12 @@ static int gigaset_initcshw(struct cardstate *cs)
		pr_err("out of memory\n");
		return 0;
		}
		ucs->int_in_buf = kmalloc(IP_MSGSIZE, GFP_KERNEL);
		if (!ucs->int_in_buf) {
		kfree(ucs);
		pr_err("out of memory\n");
		return 0;
		}

		ucs->urb_cmd_in = NULL;
		ucs->urb_cmd_out = NULL;
		@@ -2292,7 +2302,7 @@ static int gigaset_probe(struct usb_interface *interface,
		usb_fill_int_urb(ucs->urb_int_in, udev,
		usb_rcvintpipe(udev,
		(endpoint->bEndpointAddress) & 0x0f),
		ucs->int_in_buf, 3, read_int_callback, cs,
		ucs->int_in_buf, IP_MSGSIZE, read_int_callback, cs,
		endpoint->bInterval);
		if ((rc = usb_submit_urb(ucs->urb_int_in, GFP_KERNEL)) != 0) {
		dev_err(cs->dev, "could not submit interrupt URB: %s\n",

drivers/net/bnx2.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -57,8 +57,8 @@

		#define DRV_MODULE_NAME "bnx2"
		#define PFX DRV_MODULE_NAME ": "
		#define DRV_MODULE_VERSION "1.9.2"
		#define DRV_MODULE_RELDATE "Feb 11, 2009"
		#define DRV_MODULE_VERSION "1.9.3"
		#define DRV_MODULE_RELDATE "March 17, 2009"

		#define RUN_AT(x) (jiffies + (x))

		@@ -5855,9 +5855,6 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)
		for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
		msix_ent[i].entry = i;
		msix_ent[i].vector = 0;

		snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i);
		bp->irq_tbl[i].handler = bnx2_msi_1shot;
		}

		rc = pci_enable_msix(bp->pdev, msix_ent, BNX2_MAX_MSIX_VEC);
		@@ -5866,8 +5863,11 @@ bnx2_enable_msix(struct bnx2 *bp, int msix_vecs)

		bp->irq_nvecs = msix_vecs;
		bp->flags \|= BNX2_FLAG_USING_MSIX \| BNX2_FLAG_ONE_SHOT_MSI;
		for (i = 0; i < BNX2_MAX_MSIX_VEC; i++)
		for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
		bp->irq_tbl[i].vector = msix_ent[i].vector;
		snprintf(bp->irq_tbl[i].name, len, "%s-%d", dev->name, i);
		bp->irq_tbl[i].handler = bnx2_msi_1shot;
		}
		}

		static void

drivers/net/bonding/bond_main.c

+20 −5

Original line number	Diff line number	Diff line
		@@ -3545,11 +3545,26 @@ static int bond_slave_netdev_event(unsigned long event, struct net_device *slave
		}
		break;
		case NETDEV_CHANGE:
		/*
		* TODO: is this what we get if somebody
		* sets up a hierarchical bond, then rmmod's
		* one of the slave bonding devices?
		*/
		if (bond->params.mode == BOND_MODE_8023AD \|\| bond_is_lb(bond)) {
		struct slave *slave;

		slave = bond_get_slave_by_dev(bond, slave_dev);
		if (slave) {
		u16 old_speed = slave->speed;
		u16 old_duplex = slave->duplex;

		bond_update_speed_duplex(slave);

		if (bond_is_lb(bond))
		break;

		if (old_speed != slave->speed)
		bond_3ad_adapter_speed_changed(slave);
		if (old_duplex != slave->duplex)
		bond_3ad_adapter_duplex_changed(slave);
		}
		}

		break;
		case NETDEV_DOWN:
		/*

drivers/net/sh_eth.c

+17 −3

Original line number	Diff line number	Diff line
		@@ -687,6 +687,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
		{
		struct net_device *ndev = netdev;
		struct sh_eth_private *mdp = netdev_priv(ndev);
		irqreturn_t ret = IRQ_NONE;
		u32 ioaddr, boguscnt = RX_RING_SIZE;
		u32 intr_status = 0;

		@@ -696,7 +697,13 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
		/* Get interrpt stat */
		intr_status = ctrl_inl(ioaddr + EESR);
		/* Clear interrupt */
		if (intr_status & (EESR_FRC \| EESR_RMAF \| EESR_RRF \|
		EESR_RTLF \| EESR_RTSF \| EESR_PRE \| EESR_CERF \|
		TX_CHECK \| EESR_ERR_CHECK)) {
		ctrl_outl(intr_status, ioaddr + EESR);
		ret = IRQ_HANDLED;
		} else
		goto other_irq;

		if (intr_status & (EESR_FRC \| /* Frame recv*/
		EESR_RMAF \| /* Multi cast address recv*/
		@@ -723,9 +730,10 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
		ndev->name, intr_status);
		}

		other_irq:
		spin_unlock(&mdp->lock);

		return IRQ_HANDLED;
		return ret;
		}

		static void sh_eth_timer(unsigned long data)
		@@ -844,7 +852,13 @@ static int sh_eth_open(struct net_device *ndev)
		int ret = 0;
		struct sh_eth_private *mdp = netdev_priv(ndev);

		ret = request_irq(ndev->irq, &sh_eth_interrupt, 0, ndev->name, ndev);
		ret = request_irq(ndev->irq, &sh_eth_interrupt,
		#if defined(CONFIG_CPU_SUBTYPE_SH7763) \|\| defined(CONFIG_CPU_SUBTYPE_SH7764)
		IRQF_SHARED,
		#else
		0,
		#endif
		ndev->name, ndev);
		if (ret) {
		printk(KERN_ERR "Can not assign IRQ number to %s\n", CARDNAME);
		return ret;