---

yaml
---
r: 204004
b: refs/heads/master
c: c23f344
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ed6eda4fad9ea95e99f1e3cc546bcde049695cf
+refs/heads/master: c23f3445e68e1db0e74099f264bc5ff5d55ebdeb

trunk/MAINTAINERS

@@ -1365,7 +1365,7 @@ BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 M:	Eilon Greenstein <eilong@broadcom.com>
 L:	netdev@vger.kernel.org
 S:	Supported
-F:	drivers/net/bnx2x/
+F:	drivers/net/bnx2x*
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:	Matt Carlson <mcarlson@broadcom.com>
@@ -3671,7 +3671,7 @@ F:	include/linux/mv643xx.h
 MARVELL MWL8K WIRELESS DRIVER
 M:	Lennert Buytenhek <buytenh@wantstofly.org>
 L:	linux-wireless@vger.kernel.org
-S:	Odd Fixes
+S:	Maintained
 F:	drivers/net/wireless/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@ -4522,7 +4522,7 @@ PRISM54 WIRELESS DRIVER
 M:	"Luis R. Rodriguez" <mcgrof@gmail.com>
 L:	linux-wireless@vger.kernel.org
 W:	http://prism54.org
-S:	Obsolete
+S:	Maintained
 F:	drivers/net/wireless/prism54/
 
 PROMISE DC4030 CACHING DISK CONTROLLER DRIVER
@@ -4712,8 +4712,9 @@ S:	Maintained
 F:	drivers/rapidio/
 
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
+M:	Corey Thomas <coreythomas@charter.net>
 L:	linux-wireless@vger.kernel.org
-S:	Orphan
+S:	Maintained
 F:	drivers/net/wireless/ray*
 
 RCUTORTURE MODULE
@@ -6036,9 +6037,10 @@ F:	Documentation/video4linux/zc0301.txt
 F:	drivers/media/video/zc0301/
 
 USB ZD1201 DRIVER
-L:	linux-wireless@vger.kernel.org
+M:	Jeroen Vreeken <pe1rxq@amsat.org>
+L:	linux-usb@vger.kernel.org
 W:	http://linux-lc100020.sourceforge.net
-S:	Orphan
+S:	Maintained
 F:	drivers/net/wireless/zd1201.*
 
 USB ZR364XX DRIVER
@@ -6224,6 +6226,14 @@ F:	Documentation/watchdog/
 F:	drivers/watchdog/
 F:	include/linux/watchdog.h
 
+WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS
+M:	Jean Tourrilhes <jt@hpl.hp.com>
+L:	linux-wireless@vger.kernel.org
+W:	http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
+S:	Maintained
+F:	Documentation/networking/wavelan.txt
+F:	drivers/staging/wavelan/
+
 WD7000 SCSI DRIVER
 M:	Miroslav Zagorac <zaga@fly.cc.fer.hr>
 L:	linux-scsi@vger.kernel.org

trunk/drivers/atm/nicstar.c

@@ -154,6 +154,7 @@ static void which_list(ns_dev * card, struct sk_buff *skb);
 #endif
 static void ns_poll(unsigned long arg);
 static int ns_parse_mac(char *mac, unsigned char *esi);
+static short ns_h2i(char c);
 static void ns_phy_put(struct atm_dev *dev, unsigned char value,
 		       unsigned long addr);
 static unsigned char ns_phy_get(struct atm_dev *dev, unsigned long addr);
@@ -2823,9 +2824,9 @@ static int ns_parse_mac(char *mac, unsigned char *esi)
 		return -1;
 	j = 0;
 	for (i = 0; i < 6; i++) {
-		if ((byte1 = hex_to_bin(mac[j++])) < 0)
+		if ((byte1 = ns_h2i(mac[j++])) < 0)
 			return -1;
-		if ((byte0 = hex_to_bin(mac[j++])) < 0)
+		if ((byte0 = ns_h2i(mac[j++])) < 0)
 			return -1;
 		esi[i] = (unsigned char)(byte1 * 16 + byte0);
 		if (i < 5) {
@@ -2836,6 +2837,16 @@ static int ns_parse_mac(char *mac, unsigned char *esi)
 	return 0;
 }
 
+static short ns_h2i(char c)
+{
+	if (c >= '0' && c <= '9')
+		return (short)(c - '0');
+	if (c >= 'A' && c <= 'F')
+		return (short)(c - 'A' + 10);
+	if (c >= 'a' && c <= 'f')
+		return (short)(c - 'a' + 10);
+	return -1;
+}
 
 static void ns_phy_put(struct atm_dev *dev, unsigned char value,
 		       unsigned long addr)

trunk/drivers/bluetooth/Kconfig

@@ -58,18 +58,6 @@ config BT_HCIUART_BCSP
 
 	  Say Y here to compile support for HCI BCSP protocol.
 
-config BT_HCIUART_ATH3K
-	bool "Atheros AR300x serial support"
-	depends on BT_HCIUART
-	help
-	  HCIATH3K (HCI Atheros AR300x) is a serial protocol for
-	  communication between host and Atheros AR300x Bluetooth devices.
-	  This protocol enables AR300x chips to be enabled with
-	  power management support.
-	  Enable this if you have Atheros AR300x serial Bluetooth device.
-
-	  Say Y here to compile support for HCI UART ATH3K protocol.
-
 config BT_HCIUART_LL
 	bool "HCILL protocol support"
 	depends on BT_HCIUART

trunk/drivers/bluetooth/Makefile

@@ -26,5 +26,4 @@ hci_uart-y				:= hci_ldisc.o
 hci_uart-$(CONFIG_BT_HCIUART_H4)	+= hci_h4.o
 hci_uart-$(CONFIG_BT_HCIUART_BCSP)	+= hci_bcsp.o
 hci_uart-$(CONFIG_BT_HCIUART_LL)	+= hci_ll.o
-hci_uart-$(CONFIG_BT_HCIUART_ATH3K)	+= hci_ath.o
 hci_uart-objs				:= $(hci_uart-y)

trunk/drivers/bluetooth/bcm203x.c

@@ -224,7 +224,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
 
 	BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);
 
-	data->fw_data = kmemdup(firmware->data, firmware->size, GFP_KERNEL);
+	data->fw_data = kmalloc(firmware->size, GFP_KERNEL);
 	if (!data->fw_data) {
 		BT_ERR("Can't allocate memory for firmware image");
 		release_firmware(firmware);
@@ -234,6 +234,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
 		return -ENOMEM;
 	}
 
+	memcpy(data->fw_data, firmware->data, firmware->size);
 	data->fw_size = firmware->size;
 	data->fw_sent = 0;
 

trunk/drivers/bluetooth/bpa10x.c

@@ -62,7 +62,7 @@ struct hci_vendor_hdr {
 	__u8    type;
 	__le16  snum;
 	__le16  dlen;
-} __packed;
+} __attribute__ ((packed));
 
 static int bpa10x_recv(struct hci_dev *hdev, int queue, void *buf, int count)
 {

trunk/drivers/bluetooth/btmrvl_debugfs.c

@@ -216,7 +216,7 @@ static const struct file_operations btmrvl_gpiogap_fops = {
 static ssize_t btmrvl_hscmd_write(struct file *file, const char __user *ubuf,
 						size_t count, loff_t *ppos)
 {
-	struct btmrvl_private *priv = file->private_data;
+	struct btmrvl_private *priv = (struct btmrvl_private *) file->private_data;
 	char buf[16];
 	long result, ret;
 

trunk/drivers/bluetooth/btmrvl_drv.h

@@ -76,7 +76,6 @@ struct btmrvl_private {
 	int (*hw_host_to_card) (struct btmrvl_private *priv,
 				u8 *payload, u16 nb);
 	int (*hw_wakeup_firmware) (struct btmrvl_private *priv);
-	int (*hw_process_int_status) (struct btmrvl_private *priv);
 	spinlock_t driver_lock;		/* spinlock used by driver */
 #ifdef CONFIG_DEBUG_FS
 	void *debugfs_data;
@@ -119,13 +118,13 @@ struct btmrvl_cmd {
 	__le16 ocf_ogf;
 	u8 length;
 	u8 data[4];
-} __packed;
+} __attribute__ ((packed));
 
 struct btmrvl_event {
 	u8 ec;		/* event counter */
 	u8 length;
 	u8 data[4];
-} __packed;
+} __attribute__ ((packed));
 
 /* Prototype of global function */
 

trunk/drivers/bluetooth/btmrvl_main.c

@@ -502,17 +502,14 @@ static int btmrvl_service_main_thread(void *data)
 		spin_lock_irqsave(&priv->driver_lock, flags);
 		if (adapter->int_count) {
 			adapter->int_count = 0;
-			spin_unlock_irqrestore(&priv->driver_lock, flags);
-			priv->hw_process_int_status(priv);
 		} else if (adapter->ps_state == PS_SLEEP &&
 					!skb_queue_empty(&adapter->tx_queue)) {
 			spin_unlock_irqrestore(&priv->driver_lock, flags);
 			adapter->wakeup_tries++;
 			priv->hw_wakeup_firmware(priv);
 			continue;
-		} else {
-			spin_unlock_irqrestore(&priv->driver_lock, flags);
 		}
+		spin_unlock_irqrestore(&priv->driver_lock, flags);
 
 		if (adapter->ps_state == PS_SLEEP)
 			continue;