Commit 1c1ee4c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
  [XFRM]: Allow packet drops during larval state resolution.
  [CASSINI]: Check pci_set_mwi() return value.
  [NET]: "wrong timeout value" in sk_wait_data() v2
  [NETFILTER]: nf_nat_h323: call set_h225_addr instead of set_h225_addr_hook
  [NETFILTER]: nf_conntrack_h323: add missing T.120 address in OLCA
  [NETFILTER]: nf_conntrack_h323: remove unnecessary process of Information signal
  [NETFILTER]: nf_conntrack_h323: fix get_h225_addr() for IPv6 address access
  [NETFILTER]: nf_conntrack_h323: fix ASN.1 types
  [NETFILTER]: nf_conntrack_ftp: fix newline sequence number calculation
  [NETFILTER]: nf_conntrack_ftp: fix newline sequence number update
  [NET_SCHED]: sch_htb: fix event cache time calculation
  [DCCP]: Fix build warning when debugging is disabled.
  [TIPC]: Fixed erroneous introduction of for_each_netdev
  [RTNETLINK]: Fix sending netlink message when replace route.
  [TR]: Use menuconfig objects.
  [ARCNET]: Use menuconfig objects.
  [TIPC]: Use menuconfig objects.
  [SCTP]: Use menuconfig objects.
  [IPVS]: Use menuconfig objects.
  [DCCP]: Use menuconfig objects.
  ...
parents 91396c1e 14e50e57

drivers/atm/idt77252.c

+14 −13
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ static char const rcsid[] = 
#include <linux/bitops.h>

#include <linux/wait.h>

#include <linux/jiffies.h>

#include <asm/semaphore.h>

#include <linux/mutex.h>



#include <asm/io.h>

#include <asm/uaccess.h>

#include <asm/atomic.h>
@@ -2435,7 +2436,7 @@ idt77252_open(struct atm_vcc *vcc) 


	set_bit(ATM_VF_ADDR, &vcc->flags);



	down(&card->mutex);

	mutex_lock(&card->mutex);



	OPRINTK("%s: opening vpi.vci: %d.%d\n", card->name, vpi, vci);
@@ -2446,7 +2447,7 @@ idt77252_open(struct atm_vcc *vcc) 
		break;

	default:

		printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);

		up(&card->mutex);

		mutex_unlock(&card->mutex);

		return -EPROTONOSUPPORT;

	}
@@ -2455,7 +2456,7 @@ idt77252_open(struct atm_vcc *vcc) 
		card->vcs[index] = kzalloc(sizeof(struct vc_map), GFP_KERNEL);

		if (!card->vcs[index]) {

			printk("%s: can't alloc vc in open()\n", card->name);

			up(&card->mutex);

			mutex_unlock(&card->mutex);

			return -ENOMEM;

		}

		card->vcs[index]->card = card;
@@ -2484,14 +2485,14 @@ idt77252_open(struct atm_vcc *vcc) 
	if (inuse) {

		printk("%s: %s vci already in use.\n", card->name,

		       inuse == 1 ? "tx" : inuse == 2 ? "rx" : "tx and rx");

		up(&card->mutex);

		mutex_unlock(&card->mutex);

		return -EADDRINUSE;

	}



	if (vcc->qos.txtp.traffic_class != ATM_NONE) {

		error = idt77252_init_tx(card, vc, vcc, &vcc->qos);

		if (error) {

			up(&card->mutex);

			mutex_unlock(&card->mutex);

			return error;

		}

	}
@@ -2499,14 +2500,14 @@ idt77252_open(struct atm_vcc *vcc) 
	if (vcc->qos.rxtp.traffic_class != ATM_NONE) {

		error = idt77252_init_rx(card, vc, vcc, &vcc->qos);

		if (error) {

			up(&card->mutex);

			mutex_unlock(&card->mutex);

			return error;

		}

	}



	set_bit(ATM_VF_READY, &vcc->flags);



	up(&card->mutex);

	mutex_unlock(&card->mutex);

	return 0;

}
@@ -2520,7 +2521,7 @@ idt77252_close(struct atm_vcc *vcc) 
	unsigned long addr;

	unsigned long timeout;



	down(&card->mutex);

	mutex_lock(&card->mutex);



	IPRINTK("%s: idt77252_close: vc = %d (%d.%d)\n",

		card->name, vc->index, vcc->vpi, vcc->vci);
@@ -2591,7 +2592,7 @@ done: 
		free_scq(card, vc->scq);

	}



	up(&card->mutex);

	mutex_unlock(&card->mutex);

}



static int
@@ -2602,7 +2603,7 @@ idt77252_change_qos(struct atm_vcc *vcc, struct atm_qos *qos, int flags) 
	struct vc_map *vc = vcc->dev_data;

	int error = 0;



	down(&card->mutex);

	mutex_lock(&card->mutex);



	if (qos->txtp.traffic_class != ATM_NONE) {

	    	if (!test_bit(VCF_TX, &vc->flags)) {
@@ -2648,7 +2649,7 @@ idt77252_change_qos(struct atm_vcc *vcc, struct atm_qos *qos, int flags) 
	set_bit(ATM_VF_HASQOS, &vcc->flags);



out:

	up(&card->mutex);

	mutex_unlock(&card->mutex);

	return error;

}
@@ -3709,7 +3710,7 @@ idt77252_init_one(struct pci_dev *pcidev, const struct pci_device_id *id) 
	membase = pci_resource_start(pcidev, 1);

	srambase = pci_resource_start(pcidev, 2);



	init_MUTEX(&card->mutex);

	mutex_init(&card->mutex);

	spin_lock_init(&card->cmd_lock);

	spin_lock_init(&card->tst_lock);

drivers/atm/idt77252.h

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <linux/ptrace.h>

#include <linux/skbuff.h>

#include <linux/workqueue.h>



#include <linux/mutex.h>



/*****************************************************************************/

/*                                                                           */
@@ -359,7 +359,7 @@ struct idt77252_dev 
	unsigned long		srambase;	/* SAR's sram  base address */

	void __iomem		*fbq[4];	/* FBQ fill addresses */



	struct semaphore	mutex;

	struct mutex		mutex;

	spinlock_t		cmd_lock;	/* for r/w utility/sram */



	unsigned long		softstat;

drivers/bluetooth/hci_usb.c

+8 −8
Original line number Diff line number Diff line
@@ -115,11 +115,11 @@ static struct usb_device_id blacklist_ids[] = { 
	{ USB_DEVICE(0x0a5c, 0x2009), .driver_info = HCI_BCM92035 },



	/* Broadcom BCM2045 */

	{ USB_DEVICE(0x0a5c, 0x2101), .driver_info = HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x2101), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },



	/* IBM/Lenovo ThinkPad with Broadcom chip */

	{ USB_DEVICE(0x0a5c, 0x201e), .driver_info = HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x2110), .driver_info = HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x201e), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x0a5c, 0x2110), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },



	/* Targus ACB10US */

	{ USB_DEVICE(0x0a5c, 0x2100), .driver_info = HCI_RESET },
@@ -128,17 +128,17 @@ static struct usb_device_id blacklist_ids[] = { 
	{ USB_DEVICE(0x0a5c, 0x2111), .driver_info = HCI_RESET },



	/* HP laptop with Broadcom chip */

	{ USB_DEVICE(0x03f0, 0x171d), .driver_info = HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x03f0, 0x171d), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },



	/* Dell laptop with Broadcom chip */

	{ USB_DEVICE(0x413c, 0x8126), .driver_info = HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x413c, 0x8126), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },



	/* Microsoft Wireless Transceiver for Bluetooth 2.0 */

	{ USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET },



	/* Kensington Bluetooth USB adapter */

	{ USB_DEVICE(0x047d, 0x105d), .driver_info = HCI_RESET },

	{ USB_DEVICE(0x047d, 0x105e), .driver_info = HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x047d, 0x105e), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },



	/* ISSC Bluetooth Adapter v3.1 */

	{ USB_DEVICE(0x1131, 0x1001), .driver_info = HCI_RESET },
@@ -148,8 +148,8 @@ static struct usb_device_id blacklist_ids[] = { 
	{ USB_DEVICE(0x0400, 0x080a), .driver_info = HCI_BROKEN_ISOC },



	/* Belkin F8T012 and F8T013 devices */

	{ USB_DEVICE(0x050d, 0x0012), .driver_info = HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x050d, 0x0013), .driver_info = HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x050d, 0x0012), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },

	{ USB_DEVICE(0x050d, 0x0013), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },



	/* Digianswer devices */

	{ USB_DEVICE(0x08fd, 0x0001), .driver_info = HCI_DIGIANSWER },

drivers/net/arcnet/Kconfig

+4 −13
Original line number Diff line number Diff line
@@ -2,10 +2,8 @@ 
# Arcnet configuration

#



menu "ARCnet devices"

menuconfig ARCNET

	depends on NETDEVICES && (ISA || PCI)



config ARCNET

	tristate "ARCnet support"

	---help---

	  If you have a network card of this type, say Y and check out the
@@ -25,9 +23,10 @@ config ARCNET 
	  <file:Documentation/networking/net-modules.txt>.  The module will

	  be called arcnet.



if ARCNET



config ARCNET_1201

	tristate "Enable standard ARCNet packet format (RFC 1201)"

	depends on ARCNET

	help

	  This allows you to use RFC1201 with your ARCnet card via the virtual

	  arc0 device.  You need to say Y here to communicate with
@@ -38,7 +37,6 @@ config ARCNET_1201 


config ARCNET_1051

	tristate "Enable old ARCNet packet format (RFC 1051)"

	depends on ARCNET

	---help---

	  This allows you to use RFC1051 with your ARCnet card via the virtual

	  arc0s device. You only need arc0s if you want to talk to ARCnet
@@ -53,7 +51,6 @@ config ARCNET_1051 


config ARCNET_RAW

	tristate "Enable raw mode packet interface"

	depends on ARCNET

	help

	  ARCnet "raw mode" packet encapsulation, no soft headers.  Unlikely

	  to work unless talking to a copy of the same Linux arcnet driver,
@@ -61,7 +58,6 @@ config ARCNET_RAW 


config ARCNET_CAP

	tristate "Enable CAP mode packet interface"

	depends on ARCNET

	help

	  ARCnet "cap mode" packet encapsulation. Used to get the hardware

          acknowledge back to userspace. After the initial protocol byte every
@@ -80,7 +76,6 @@ config ARCNET_CAP 


config ARCNET_COM90xx

	tristate "ARCnet COM90xx (normal) chipset driver"

	depends on ARCNET

	help

	  This is the chipset driver for the standard COM90xx cards. If you

	  have always used the old ARCnet driver without knowing what type of
@@ -92,7 +87,6 @@ config ARCNET_COM90xx 


config ARCNET_COM90xxIO

	tristate "ARCnet COM90xx (IO mapped) chipset driver"

	depends on ARCNET

	---help---

	  This is the chipset driver for the COM90xx cards, using them in

	  IO-mapped mode instead of memory-mapped mode. This is slower than
@@ -105,7 +99,6 @@ config ARCNET_COM90xxIO 


config ARCNET_RIM_I

	tristate "ARCnet COM90xx (RIM I) chipset driver"

	depends on ARCNET

	---help---

	  This is yet another chipset driver for the COM90xx cards, but this

	  time only using memory-mapped mode, and no IO ports at all. This
@@ -118,7 +111,6 @@ config ARCNET_RIM_I 


config ARCNET_COM20020

	tristate "ARCnet COM20020 chipset driver"

	depends on ARCNET

	help

	  This is the driver for the new COM20020 chipset. It supports such

	  things as promiscuous mode, so packet sniffing is possible, and
@@ -136,5 +128,4 @@ config ARCNET_COM20020_PCI 
	tristate "Support for COM20020 on PCI"

	depends on ARCNET_COM20020 && PCI



endmenu

endif # ARCNET

drivers/net/cassini.c

+4 −1
Original line number Diff line number Diff line
@@ -4919,7 +4919,10 @@ static int __devinit cas_init_one(struct pci_dev *pdev, 
	pci_cmd &= ~PCI_COMMAND_SERR;

	pci_cmd |= PCI_COMMAND_PARITY;

	pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);

	pci_set_mwi(pdev);

	if (pci_set_mwi(pdev))

		printk(KERN_WARNING PFX "Could enable MWI for %s\n",

		       pci_name(pdev));



	/*

	 * On some architectures, the default cache line size set

	 * by pci_set_mwi reduces perforamnce.  We have to increase

CRA Git | Maintained and supported by SUSTech CRA and CCSE