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

Commit d56ffd38 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: (32 commits)
  ucc_geth: Fix oops when using fixed-link support
  dm9000: locking bugfix
  net: update dnet.c for bus_id removal
  dnet: DNET should depend on HAS_IOMEM
  dca: add missing copyright/license headers
  nl80211: Check that function pointer != NULL before using it
  sungem: missing net_device_ops
  be2net: fix to restore vlan ids into BE2 during a IF DOWN->UP cycle
  be2net: replenish when posting to rx-queue is starved in out of mem conditions
  bas_gigaset: correctly allocate USB interrupt transfer buffer
  smsc911x: reset last known duplex and carrier on open
  sh_eth: Fix mistake of the address of SH7763
  sh_eth: Change handling of IRQ
  netns: oops in ip[6]_frag_reasm incrementing stats
  net: kfree(napi->skb) => kfree_skb
  net: fix sctp breakage
  ipv6: fix display of local and remote sit endpoints
  net: Document /proc/sys/net/core/netdev_budget
  tulip: fix crash on iface up with shirq debug
  virtio_net: Make virtio_net support carrier detection
  ...
parents 12a37b5e 61fa9dcf

Documentation/filesystems/proc.txt

+7 −0
Original line number Original line 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

this should be enabled, but if the problem persists the messages can be

disabled.

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

netdev_max_backlog

------------------

------------------

drivers/dca/dca-sysfs.c

+21 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright(c) 2007 - 2009 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the Free

 * Software Foundation; either version 2 of the License, or (at your option)

 * any later version.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc., 59

 * Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 *

 * The full GNU General Public License is included in this distribution in the

 * file called COPYING.

 */



#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/device.h>

#include <linux/device.h>

drivers/isdn/gigaset/bas-gigaset.c

+13 −3
Original line number Original line 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 */

/* length limit according to Siemens 3070usb-protokoll.doc ch. 2.1 */

#define IF_WRITEBUF 264

#define IF_WRITEBUF 264





/* interrupt pipe message size according to ibid. ch. 2.2 */

#define IP_MSGSIZE 3



/* Values for the Gigaset 307x */

/* Values for the Gigaset 307x */

#define USB_GIGA_VENDOR_ID      0x0681

#define USB_GIGA_VENDOR_ID      0x0681

#define USB_3070_PRODUCT_ID     0x0001

#define USB_3070_PRODUCT_ID     0x0001
@@ -110,7 +113,7 @@ struct bas_cardstate { 
	unsigned char		*rcvbuf;	/* AT reply receive buffer */

	unsigned char		*rcvbuf;	/* AT reply receive buffer */





	struct urb		*urb_int_in;	/* URB for interrupt pipe */

	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 */

	spinlock_t		lock;		/* locks all following */

	int			basstate;	/* bitmap (BS_*) */

	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 */

	/* 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",

		dev_warn(cs->dev, "incomplete interrupt packet (%d bytes)\n",

			 urb->actual_length);

			 urb->actual_length);

		goto resubmit;

		goto resubmit;
@@ -2127,6 +2130,7 @@ static void gigaset_reinitbcshw(struct bc_state *bcs) 
static void gigaset_freecshw(struct cardstate *cs)

static void gigaset_freecshw(struct cardstate *cs)

{

{

	/* timers, URBs and rcvbuf are disposed of in disconnect */

	/* timers, URBs and rcvbuf are disposed of in disconnect */

	kfree(cs->hw.bas->int_in_buf);

	kfree(cs->hw.bas);

	kfree(cs->hw.bas);

	cs->hw.bas = NULL;

	cs->hw.bas = NULL;

}

}
@@ -2140,6 +2144,12 @@ static int gigaset_initcshw(struct cardstate *cs) 
		pr_err("out of memory\n");

		pr_err("out of memory\n");

		return 0;

		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_in = NULL;

	ucs->urb_cmd_out = 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_fill_int_urb(ucs->urb_int_in, udev,

			 usb_rcvintpipe(udev,

			 usb_rcvintpipe(udev,

					(endpoint->bEndpointAddress) & 0x0f),

					(endpoint->bEndpointAddress) & 0x0f),

			 ucs->int_in_buf, 3, read_int_callback, cs,

			 ucs->int_in_buf, IP_MSGSIZE, read_int_callback, cs,

			 endpoint->bInterval);

			 endpoint->bInterval);

	if ((rc = usb_submit_urb(ucs->urb_int_in, GFP_KERNEL)) != 0) {

	if ((rc = usb_submit_urb(ucs->urb_int_in, GFP_KERNEL)) != 0) {

		dev_err(cs->dev, "could not submit interrupt URB: %s\n",

		dev_err(cs->dev, "could not submit interrupt URB: %s\n",

drivers/net/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -1042,7 +1042,7 @@ config NI65 




config DNET

config DNET

	tristate "Dave ethernet support (DNET)"

	tristate "Dave ethernet support (DNET)"

	depends on NET_ETHERNET

	depends on NET_ETHERNET && HAS_IOMEM

	select PHYLIB

	select PHYLIB

	help

	help

	  The Dave ethernet interface (DNET) is found on Qong Board FPGA.

	  The Dave ethernet interface (DNET) is found on Qong Board FPGA.

drivers/net/benet/be.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -194,6 +194,7 @@ struct be_adapter { 
	struct be_eq_obj rx_eq;

	struct be_eq_obj rx_eq;

	struct be_rx_obj rx_obj;

	struct be_rx_obj rx_obj;

	u32 big_page_size;	/* Compounded page size shared by rx wrbs */

	u32 big_page_size;	/* Compounded page size shared by rx wrbs */

	bool rx_post_starved;	/* Zero rx frags have been posted to BE */





	struct vlan_group *vlan_grp;

	struct vlan_group *vlan_grp;

	u16 num_vlans;

	u16 num_vlans;