Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	include/net/bluetooth/l2cap.h
	net/bluetooth/hci_conn.c
	net/bluetooth/l2cap_core.c

diff --combined drivers/bluetooth/btusb.c
index 066d5ec83a9b562afef14200e0e0e372aab47945,789c9b579aea5bac7e0b2abfe3d14b377917a9c4..e61a195969bf9f43c4b14d73a0151d8d85ee8942
--- 1/drivers/bluetooth/btusb.c
--- 2/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -37,13 -37,13 +37,13 @@@
  
  #define VERSION "0.6"
  
- static int ignore_dga;
- static int ignore_csr;
- static int ignore_sniffer;
- static int disable_scofix;
- static int force_scofix;
+ static bool ignore_dga;
+ static bool ignore_csr;
+ static bool ignore_sniffer;
+ static bool disable_scofix;
+ static bool force_scofix;
  
- static int reset = 1;
+ static bool reset = 1;
  
  static struct usb_driver btusb_driver;
  
@@@ -243,7 -243,7 +243,7 @@@ static int inc_tx(struct btusb_data *da
  static void btusb_intr_complete(struct urb *urb)
  {
        struct hci_dev *hdev = urb->context;
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
        int err;
  
        BT_DBG("%s urb %p status %d count %d", hdev->name,
@@@ -282,7 -282,7 +282,7 @@@
  
  static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)
  {
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
        struct urb *urb;
        unsigned char *buf;
        unsigned int pipe;
@@@ -331,7 -331,7 +331,7 @@@
  static void btusb_bulk_complete(struct urb *urb)
  {
        struct hci_dev *hdev = urb->context;
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
        int err;
  
        BT_DBG("%s urb %p status %d count %d", hdev->name,
@@@ -370,7 -370,7 +370,7 @@@
  
  static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)
  {
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
        struct urb *urb;
        unsigned char *buf;
        unsigned int pipe;
@@@ -417,7 -417,7 +417,7 @@@
  static void btusb_isoc_complete(struct urb *urb)
  {
        struct hci_dev *hdev = urb->context;
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
        int i, err;
  
        BT_DBG("%s urb %p status %d count %d", hdev->name,
@@@ -484,7 -484,7 +484,7 @@@ static inline void __fill_isoc_descript
  
  static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)
  {
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
        struct urb *urb;
        unsigned char *buf;
        unsigned int pipe;
@@@ -537,7 -537,7 +537,7 @@@ static void btusb_tx_complete(struct ur
  {
        struct sk_buff *skb = urb->context;
        struct hci_dev *hdev = (struct hci_dev *) skb->dev;
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
  
        BT_DBG("%s urb %p status %d count %d", hdev->name,
                                        urb, urb->status, urb->actual_length);
@@@ -584,7 -584,7 +584,7 @@@ done
  
  static int btusb_open(struct hci_dev *hdev)
  {
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
        int err;
  
        BT_DBG("%s", hdev->name);
@@@ -634,7 -634,7 +634,7 @@@ static void btusb_stop_traffic(struct b
  
  static int btusb_close(struct hci_dev *hdev)
  {
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
        int err;
  
        BT_DBG("%s", hdev->name);
@@@ -664,7 -664,7 +664,7 @@@ failed
  
  static int btusb_flush(struct hci_dev *hdev)
  {
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
  
        BT_DBG("%s", hdev->name);
  
@@@ -676,7 -676,7 +676,7 @@@
  static int btusb_send_frame(struct sk_buff *skb)
  {
        struct hci_dev *hdev = (struct hci_dev *) skb->dev;
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
        struct usb_ctrlrequest *dr;
        struct urb *urb;
        unsigned int pipe;
@@@ -784,9 -784,18 +784,9 @@@ done
        return err;
  }
  
 -static void btusb_destruct(struct hci_dev *hdev)
 -{
 -      struct btusb_data *data = hdev->driver_data;
 -
 -      BT_DBG("%s", hdev->name);
 -
 -      kfree(data);
 -}
 -
  static void btusb_notify(struct hci_dev *hdev, unsigned int evt)
  {
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
  
        BT_DBG("%s evt %d", hdev->name, evt);
  
@@@ -798,7 -807,7 +798,7 @@@
  
  static inline int __set_isoc_interface(struct hci_dev *hdev, int altsetting)
  {
 -      struct btusb_data *data = hdev->driver_data;
 +      struct btusb_data *data = hci_get_drvdata(hdev);
        struct usb_interface *intf = data->isoc;
        struct usb_endpoint_descriptor *ep_desc;
        int i, err;
@@@ -986,7 -995,7 +986,7 @@@ static int btusb_probe(struct usb_inter
        }
  
        hdev->bus = HCI_USB;
 -      hdev->driver_data = data;
 +      hci_set_drvdata(hdev, data);
  
        data->hdev = hdev;
  
@@@ -996,8 -1005,11 +996,8 @@@
        hdev->close    = btusb_close;
        hdev->flush    = btusb_flush;
        hdev->send     = btusb_send_frame;
 -      hdev->destruct = btusb_destruct;
        hdev->notify   = btusb_notify;
  
 -      hdev->owner = THIS_MODULE;
 -
        /* Interface numbers are hardcoded in the specification */
        data->isoc = usb_ifnum_to_if(data->udev, 1);
  
@@@ -1079,6 -1091,9 +1079,6 @@@ static void btusb_disconnect(struct usb
                return;
  
        hdev = data->hdev;
 -
 -      __hci_dev_hold(hdev);
 -
        usb_set_intfdata(data->intf, NULL);
  
        if (data->isoc)
@@@ -1091,8 -1106,9 +1091,8 @@@
        else if (data->isoc)
                usb_driver_release_interface(&btusb_driver, data->isoc);
  
 -      __hci_dev_put(hdev);
 -
        hci_free_dev(hdev);
 +      kfree(data);
  }
  
  #ifdef CONFIG_PM

diff --combined drivers/bluetooth/hci_bcsp.c
index 8bf0c3e774e8ae9aafe3ff9df5d3f8c3f5dc1869,a767d4de45a4177d7fbc213f6f5edbcb42ae21c2..661a8dc4d2f8b346e390053ee45d63cb7249346e
--- 1/drivers/bluetooth/hci_bcsp.c
--- 2/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@@ -49,8 -49,8 +49,8 @@@
  
  #define VERSION "0.3"
  
- static int txcrc = 1;
- static int hciextn = 1;
+ static bool txcrc = 1;
+ static bool hciextn = 1;
  
  #define BCSP_TXWINSIZE        4
  
@@@ -692,7 -692,7 +692,7 @@@ static int bcsp_open(struct hci_uart *h
  
        BT_DBG("hu %p", hu);
  
 -      bcsp = kzalloc(sizeof(*bcsp), GFP_ATOMIC);
 +      bcsp = kzalloc(sizeof(*bcsp), GFP_KERNEL);
        if (!bcsp)
                return -ENOMEM;
  

diff --combined drivers/bluetooth/hci_ldisc.c
index 01c23dfe2a10b18bf0119753b571234c2584943c,07114489994f5f383f4aef45c38cca72b38b52f9..c2d637adb3ca91f334b47577ed33982ee465f35d
--- 1/drivers/bluetooth/hci_ldisc.c
--- 2/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@@ -48,7 -48,7 +48,7 @@@
  
  #define VERSION "2.2"
  
- static int reset = 0;
+ static bool reset = 0;
  
  static struct hci_uart_proto *hup[HCI_UART_MAX_PROTO];
  
@@@ -174,7 -174,7 +174,7 @@@ static int hci_uart_open(struct hci_de
  /* Reset device */
  static int hci_uart_flush(struct hci_dev *hdev)
  {
 -      struct hci_uart *hu  = (struct hci_uart *) hdev->driver_data;
 +      struct hci_uart *hu  = hci_get_drvdata(hdev);
        struct tty_struct *tty = hu->tty;
  
        BT_DBG("hdev %p tty %p", hdev, tty);
@@@ -220,7 -220,7 +220,7 @@@ static int hci_uart_send_frame(struct s
        if (!test_bit(HCI_RUNNING, &hdev->flags))
                return -EBUSY;
  
 -      hu = (struct hci_uart *) hdev->driver_data;
 +      hu = hci_get_drvdata(hdev);
  
        BT_DBG("%s: type %d len %d", hdev->name, bt_cb(skb)->pkt_type, skb->len);
  
@@@ -231,6 -231,15 +231,6 @@@
        return 0;
  }
  
 -static void hci_uart_destruct(struct hci_dev *hdev)
 -{
 -      if (!hdev)
 -              return;
 -
 -      BT_DBG("%s", hdev->name);
 -      kfree(hdev->driver_data);
 -}
 -
  /* ------ LDISC part ------ */
  /* hci_uart_tty_open
   * 
@@@ -307,8 -316,6 +307,8 @@@ static void hci_uart_tty_close(struct t
                                hci_free_dev(hdev);
                        }
                }
 +
 +              kfree(hu);
        }
  }
  
@@@ -384,14 -391,17 +384,14 @@@ static int hci_uart_register_dev(struc
        hu->hdev = hdev;
  
        hdev->bus = HCI_UART;
 -      hdev->driver_data = hu;
 +      hci_set_drvdata(hdev, hu);
  
        hdev->open  = hci_uart_open;
        hdev->close = hci_uart_close;
        hdev->flush = hci_uart_flush;
        hdev->send  = hci_uart_send_frame;
 -      hdev->destruct = hci_uart_destruct;
        hdev->parent = hu->tty->dev;
  
 -      hdev->owner = THIS_MODULE;
 -
        if (!reset)
                set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);