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

Commit 9457b24a 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: (66 commits)
  can-bcm: fix minor heap overflow
  gianfar: Do not call device_set_wakeup_enable() under a spinlock
  ipv6: Warn users if maximum number of routes is reached.
  docs: Add neigh/gc_thresh3 and route/max_size documentation.
  axnet_cs: fix resume problem for some Ax88790 chip
  ipv6: addrconf: don't remove address state on ifdown if the address is being kept
  tcp: Don't change unlocked socket state in tcp_v4_err().
  x25: Prevent crashing when parsing bad X.25 facilities
  cxgb4vf: add call to Firmware to reset VF State.
  cxgb4vf: Fail open if link_start() fails.
  cxgb4vf: flesh out PCI Device ID Table ...
  cxgb4vf: fix some errors in Gather List to skb conversion
  cxgb4vf: fix bug in Generic Receive Offload
  cxgb4vf: don't implement trivial (and incorrect) ndo_select_queue()
  ixgbe: Look inside vlan when determining offload protocol.
  bnx2x: Look inside vlan when determining checksum proto.
  vlan: Add function to retrieve EtherType from vlan packets.
  virtio-net: init link state correctly
  ucc_geth: Fix deadlock
  ucc_geth: Do not bring the whole IF down when TX failure.
  ...
parents 80ef913f 0597d1b9

Documentation/networking/ip-sysctl.txt

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,15 @@ ip_no_pmtu_disc - BOOLEAN 
min_pmtu - INTEGER

	default 562 - minimum discovered Path MTU



route/max_size - INTEGER

	Maximum number of routes allowed in the kernel.  Increase

	this when using large numbers of interfaces and/or routes.



neigh/default/gc_thresh3 - INTEGER

	Maximum number of neighbor entries allowed.  Increase this

	when using large numbers of interfaces and when communicating

	with large numbers of directly-connected peers.



mtu_expires - INTEGER

	Time, in seconds, that cached PMTU information is kept.

drivers/atm/solos-attrlist.c

+1 −0
Original line number Diff line number Diff line 
SOLOS_ATTR_RO(DriverVersion)

SOLOS_ATTR_RO(APIVersion)

SOLOS_ATTR_RO(FirmwareVersion)

SOLOS_ATTR_RO(Version)

// SOLOS_ATTR_RO(DspVersion)

// SOLOS_ATTR_RO(CommonHandshake)

SOLOS_ATTR_RO(Connected)

drivers/atm/solos-pci.c

+8 −0
Original line number Diff line number Diff line
@@ -1161,6 +1161,14 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	dev_info(&dev->dev, "Solos FPGA Version %d.%02d svn-%d\n",

		 major_ver, minor_ver, fpga_ver);



	if (fpga_ver < 37 && (fpga_upgrade || firmware_upgrade ||

			      db_fpga_upgrade || db_firmware_upgrade)) {

		dev_warn(&dev->dev,

			 "FPGA too old; cannot upgrade flash. Use JTAG.\n");

		fpga_upgrade = firmware_upgrade = 0;

		db_fpga_upgrade = db_firmware_upgrade = 0;

	}



	if (card->fpga_version >= DMA_SUPPORTED){

		card->using_dma = 1;

	} else {

drivers/bluetooth/btusb.c

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ static struct usb_device_id btusb_table[] = { 
	/* Apple MacBookPro6,2 */

	{ USB_DEVICE(0x05ac, 0x8218) },



	/* Apple MacBookAir3,1, MacBookAir3,2 */

	{ USB_DEVICE(0x05ac, 0x821b) },



	/* AVM BlueFRITZ! USB v2.0 */

	{ USB_DEVICE(0x057c, 0x3800) },
@@ -1029,6 +1032,8 @@ static int btusb_probe(struct usb_interface *intf, 


	usb_set_intfdata(intf, data);



	usb_enable_autosuspend(interface_to_usbdev(intf));



	return 0;

}

drivers/net/bnx2x/bnx2x_cmn.c

+1 −1
Original line number Diff line number Diff line
@@ -1680,7 +1680,7 @@ static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb) 
		rc = XMIT_PLAIN;



	else {

		if (skb->protocol == htons(ETH_P_IPV6)) {

		if (vlan_get_protocol(skb) == htons(ETH_P_IPV6)) {

			rc = XMIT_CSUM_V6;

			if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)

				rc |= XMIT_CSUM_TCP;