compat-wireless: refresh patches for next-20120524

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

diff --git a/patches/0001-netdev_ops.patch b/patches/0001-netdev_ops.patch
index 69e72e4323baa099fc8510981ae275f025a1402a..bad3c5c435de453a2dfeb52315a48a38c541e3ae 100644 (file)
--- a/patches/0001-netdev_ops.patch
+++ b/patches/0001-netdev_ops.patch
@@ -179,7 +179,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
        priv->media_connected = false;
 --- a/net/bluetooth/bnep/netdev.c
 +++ b/net/bluetooth/bnep/netdev.c
-@@ -232,7 +232,7 @@ void bnep_net_setup(struct net_device *d
+@@ -224,7 +224,7 @@ void bnep_net_setup(struct net_device *d
  
        ether_setup(dev);
        dev->priv_flags &= ~IFF_TX_SKB_SHARING;

diff --git a/patches/0002-net-misc.patch b/patches/0002-net-misc.patch
index 200a5d0d5d2783e0c85b1481bdb30e25d2c976ad..d2c5a69707602cedc669fd1aff8692b1164e80a2 100644 (file)
--- a/patches/0002-net-misc.patch
+++ b/patches/0002-net-misc.patch
@@ -36,7 +36,7 @@ compile tested against older kernels.
  
 --- a/net/bluetooth/bnep/netdev.c
 +++ b/net/bluetooth/bnep/netdev.c
-@@ -170,8 +170,12 @@ static inline int bnep_net_proto_filter(
+@@ -162,8 +162,12 @@ static int bnep_net_proto_filter(struct
  }
  #endif
  

diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index 44c362d03ae74994c81671842935865dc71a6c02..ecce8920807a8cd458bbeb85c8abaf9f5a3ea2d0 100644 (file)
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -154,7 +154,7 @@ CONFIG_BT_HIDP does not build with older kernel versions.
  #else
 --- a/net/bluetooth/rfcomm/sock.c
 +++ b/net/bluetooth/rfcomm/sock.c
-@@ -879,7 +879,7 @@ static int rfcomm_sock_ioctl(struct sock
+@@ -860,7 +860,7 @@ static int rfcomm_sock_ioctl(struct sock
        err = bt_sock_ioctl(sock, cmd, arg);
  
        if (err == -ENOIOCTLCMD) {

diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch
index 4440de12bde5dee367fe07954ee9296617e83284..4187e7eae9a3eee979e8d82cea9ecf8dc10c0da2 100644 (file)
--- a/patches/14-device-type.patch
+++ b/patches/14-device-type.patch
@@ -22,7 +22,7 @@ compile warning.
                                         unsigned long state,
 --- a/net/bluetooth/bnep/core.c
 +++ b/net/bluetooth/bnep/core.c
-@@ -545,9 +545,11 @@ static struct device *bnep_get_device(st
+@@ -528,9 +528,11 @@ static struct device *bnep_get_device(st
        return conn ? &conn->dev : NULL;
  }
  

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index d956defc76e8ba0c5d22e1ba185c5b06423a6192..a4918857eb6ccb6c64a81db87c168eb1e62c4a3b 100644 (file)
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -31,7 +31,7 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/af_bluetooth.c
 +++ b/net/bluetooth/af_bluetooth.c
-@@ -122,8 +122,12 @@ int bt_sock_unregister(int proto)
+@@ -111,8 +111,12 @@ int bt_sock_unregister(int proto)
  }
  EXPORT_SYMBOL(bt_sock_unregister);
  
@@ -44,7 +44,7 @@ here still, but for now we keep this here.
  {
        int err;
  
-@@ -141,7 +145,11 @@ static int bt_sock_create(struct net *ne
+@@ -130,7 +134,11 @@ static int bt_sock_create(struct net *ne
        read_lock(&bt_proto_lock);
  
        if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) {
@@ -56,7 +56,7 @@ here still, but for now we keep this here.
                if (!err)
                        bt_sock_reclassify_lock(sock->sk, proto);
                module_put(bt_proto[proto]->owner);
-@@ -473,7 +481,11 @@ int bt_sock_ioctl(struct socket *sock, u
+@@ -463,7 +471,11 @@ int bt_sock_ioctl(struct socket *sock, u
                if (sk->sk_state == BT_LISTEN)
                        return -EINVAL;
  
@@ -98,7 +98,7 @@ here still, but for now we keep this here.
  {
        struct hci_ufilter uf = { .opcode = 0 };
        struct sock *sk = sock->sk;
-@@ -1063,8 +1067,12 @@ static struct proto hci_sk_proto = {
+@@ -1056,8 +1061,12 @@ static struct proto hci_sk_proto = {
        .obj_size       = sizeof(struct hci_pinfo)
  };
  
@@ -113,7 +113,7 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/hci_sysfs.c
 +++ b/net/bluetooth/hci_sysfs.c
-@@ -72,7 +72,11 @@ static struct attribute_group bt_link_gr
+@@ -71,7 +71,11 @@ static struct attribute_group bt_link_gr
        .attrs = bt_link_attrs,
  };
  
@@ -125,7 +125,7 @@ here still, but for now we keep this here.
        &bt_link_group,
        NULL
  };
-@@ -141,7 +145,11 @@ void hci_conn_del_sysfs(struct hci_conn
+@@ -140,7 +144,11 @@ void hci_conn_del_sysfs(struct hci_conn
                dev = device_find_child(&conn->dev, NULL, __match_tty);
                if (!dev)
                        break;
@@ -137,7 +137,7 @@ here still, but for now we keep this here.
                put_device(dev);
        }
  
-@@ -361,7 +369,11 @@ static struct attribute_group bt_host_gr
+@@ -378,7 +386,11 @@ static struct attribute_group bt_host_gr
        .attrs = bt_host_attrs,
  };
  
@@ -151,7 +151,7 @@ here still, but for now we keep this here.
  };
 --- a/net/bluetooth/hidp/core.c
 +++ b/net/bluetooth/hidp/core.c
-@@ -398,6 +398,7 @@ err:
+@@ -379,6 +379,7 @@ err:
        return ret;
  }
  
@@ -159,7 +159,7 @@ here still, but for now we keep this here.
  static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count,
                unsigned char report_type)
  {
-@@ -456,6 +457,16 @@ err:
+@@ -437,6 +438,16 @@ err:
        mutex_unlock(&session->report_mutex);
        return ret;
  }
@@ -176,7 +176,7 @@ here still, but for now we keep this here.
  
  static void hidp_idle_timeout(unsigned long arg)
  {
-@@ -757,8 +768,14 @@ static int hidp_session(void *arg)
+@@ -738,8 +749,14 @@ static int hidp_session(void *arg)
        }
  
        if (session->hid) {
@@ -191,7 +191,7 @@ here still, but for now we keep this here.
        }
  
        /* Wakeup user-space polling for socket errors */
-@@ -869,6 +886,70 @@ static void hidp_close(struct hid_device
+@@ -850,6 +867,70 @@ static void hidp_close(struct hid_device
  {
  }
  
@@ -262,7 +262,7 @@ here still, but for now we keep this here.
  static int hidp_parse(struct hid_device *hid)
  {
        struct hidp_session *session = hid->driver_data;
-@@ -956,7 +1037,9 @@ static int hidp_setup_hid(struct hidp_se
+@@ -937,7 +1018,9 @@ static int hidp_setup_hid(struct hidp_se
        hid->dev.parent = &session->conn->dev;
        hid->ll_driver = &hidp_hid_driver;
  
@@ -272,7 +272,7 @@ here still, but for now we keep this here.
        hid->hid_output_raw_report = hidp_output_raw_report;
  
        return 0;
-@@ -967,6 +1050,7 @@ fault:
+@@ -948,6 +1031,7 @@ fault:
  
        return err;
  }
@@ -280,7 +280,7 @@ here still, but for now we keep this here.
  
  int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock)
  {
-@@ -982,6 +1066,39 @@ int hidp_add_connection(struct hidp_conn
+@@ -963,6 +1047,39 @@ int hidp_add_connection(struct hidp_conn
  
        BT_DBG("rd_data %p rd_size %d", req->rd_data, req->rd_size);
  
@@ -320,7 +320,7 @@ here still, but for now we keep this here.
        down_write(&hidp_session_sem);
  
        s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst);
-@@ -1029,6 +1146,7 @@ int hidp_add_connection(struct hidp_conn
+@@ -1010,6 +1127,7 @@ int hidp_add_connection(struct hidp_conn
  
        __hidp_link_session(session);
  
@@ -328,7 +328,7 @@ here still, but for now we keep this here.
        if (req->rd_size > 0) {
                err = hidp_setup_hid(session, req);
                if (err)
-@@ -1040,6 +1158,16 @@ int hidp_add_connection(struct hidp_conn
+@@ -1021,6 +1139,16 @@ int hidp_add_connection(struct hidp_conn
                if (err < 0)
                        goto purge;
        }
@@ -345,7 +345,7 @@ here still, but for now we keep this here.
  
        hidp_set_timer(session);
  
-@@ -1098,6 +1226,7 @@ unlink:
+@@ -1079,6 +1207,7 @@ unlink:
                session->input = NULL;
        }
  
@@ -353,7 +353,7 @@ here still, but for now we keep this here.
        if (session->hid) {
                hid_destroy_device(session->hid);
                session->hid = NULL;
-@@ -1111,10 +1240,15 @@ purge:
+@@ -1092,10 +1221,15 @@ purge:
  
        skb_queue_purge(&session->ctrl_transmit);
        skb_queue_purge(&session->intr_transmit);
@@ -371,7 +371,7 @@ here still, but for now we keep this here.
  }
 --- a/net/bluetooth/rfcomm/sock.c
 +++ b/net/bluetooth/rfcomm/sock.c
-@@ -325,8 +325,13 @@ static struct sock *rfcomm_sock_alloc(st
+@@ -306,8 +306,13 @@ static struct sock *rfcomm_sock_alloc(st
        return sk;
  }
  
@@ -385,7 +385,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -680,7 +685,11 @@ static int rfcomm_sock_setsockopt_old(st
+@@ -661,7 +666,11 @@ static int rfcomm_sock_setsockopt_old(st
        return err;
  }
  
@@ -399,7 +399,7 @@ here still, but for now we keep this here.
        struct bt_security sec;
 --- a/net/bluetooth/rfcomm/tty.c
 +++ b/net/bluetooth/rfcomm/tty.c
-@@ -718,8 +718,12 @@ static int rfcomm_tty_open(struct tty_st
+@@ -713,8 +713,12 @@ static int rfcomm_tty_open(struct tty_st
        remove_wait_queue(&dev->wait, &wait);
  
        if (err == 0)
@@ -412,7 +412,7 @@ here still, but for now we keep this here.
  
        rfcomm_tty_copy_pending(dev);
  
-@@ -743,7 +747,11 @@ static void rfcomm_tty_close(struct tty_
+@@ -738,7 +742,11 @@ static void rfcomm_tty_close(struct tty_
        if (!--dev->port.count) {
                spin_unlock_irqrestore(&dev->port.lock, flags);
                if (dev->tty_dev->parent)
@@ -424,7 +424,7 @@ here still, but for now we keep this here.
  
                /* Close DLC and dettach TTY */
                rfcomm_dlc_close(dev->dlc, 0);
-@@ -819,7 +827,11 @@ static int rfcomm_tty_write_room(struct
+@@ -814,7 +822,11 @@ static int rfcomm_tty_write_room(struct
        return room;
  }
  
@@ -436,7 +436,7 @@ here still, but for now we keep this here.
  {
        BT_DBG("tty %p cmd 0x%02x", tty, cmd);
  
-@@ -1078,7 +1090,11 @@ static void rfcomm_tty_hangup(struct tty
+@@ -1073,7 +1085,11 @@ static void rfcomm_tty_hangup(struct tty
        }
  }
  
@@ -448,7 +448,7 @@ here still, but for now we keep this here.
  {
        struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
  
-@@ -1087,7 +1103,11 @@ static int rfcomm_tty_tiocmget(struct tt
+@@ -1082,7 +1098,11 @@ static int rfcomm_tty_tiocmget(struct tt
        return dev->modem_status;
  }
  
@@ -462,7 +462,7 @@ here still, but for now we keep this here.
        struct rfcomm_dlc *dlc = dev->dlc;
 --- a/net/bluetooth/sco.c
 +++ b/net/bluetooth/sco.c
-@@ -440,8 +440,12 @@ static struct sock *sco_sock_alloc(struc
+@@ -423,8 +423,12 @@ static struct sock *sco_sock_alloc(struc
        return sk;
  }
  
@@ -475,7 +475,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -670,7 +674,11 @@ static int sco_sock_sendmsg(struct kiocb
+@@ -653,7 +657,11 @@ static int sco_sock_sendmsg(struct kiocb
        return err;
  }
  
@@ -489,7 +489,7 @@ here still, but for now we keep this here.
        int err = 0;
 --- a/net/bluetooth/bnep/sock.c
 +++ b/net/bluetooth/bnep/sock.c
-@@ -195,8 +195,12 @@ static struct proto bnep_proto = {
+@@ -179,8 +179,12 @@ static struct proto bnep_proto = {
        .obj_size       = sizeof(struct bt_sock)
  };
  
@@ -519,7 +519,7 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/hidp/sock.c
 +++ b/net/bluetooth/hidp/sock.c
-@@ -242,8 +242,12 @@ static struct proto hidp_proto = {
+@@ -228,8 +228,12 @@ static struct proto hidp_proto = {
        .obj_size       = sizeof(struct bt_sock)
  };
  
@@ -534,7 +534,7 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/l2cap_sock.c
 +++ b/net/bluetooth/l2cap_sock.c
-@@ -539,7 +539,14 @@ static int l2cap_sock_setsockopt_old(str
+@@ -538,7 +538,14 @@ static int l2cap_sock_setsockopt_old(str
        return err;
  }
  
@@ -549,7 +549,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk = sock->sk;
        struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1079,8 +1086,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1078,8 +1085,12 @@ static struct sock *l2cap_sock_alloc(str
        return sk;
  }
  
@@ -562,7 +562,7 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -1092,7 +1103,11 @@ static int l2cap_sock_create(struct net
+@@ -1091,7 +1102,11 @@ static int l2cap_sock_create(struct net
                        sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
                return -ESOCKTNOSUPPORT;
  

diff --git a/patches/24-pcmcia.patch b/patches/24-pcmcia.patch
index a2bc8423d79e7982486db1a99a3d3e5d4cb15be8..7e6c16ed3b1c520ce0620bea9fa511b90973d29d 100644 (file)
--- a/patches/24-pcmcia.patch
+++ b/patches/24-pcmcia.patch
@@ -585,7 +585,7 @@
 +              unsigned int iobase = info->p_dev->io.BasePort1;
 +#endif
                register struct sk_buff *skb;
-               register int len;
+               int len;
  
 @@ -209,7 +213,11 @@ static void dtl1_receive(dtl1_info_t *in
                return;

diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index a094789d2e27d3f9fea59a0924ca9ae3f0659920..0149ec1701ae7db65d18c8201467ea6ccec5efbe 100644 (file)
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -665,7 +665,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
                                 unsigned int *total_flags,
 --- a/net/bluetooth/bnep/netdev.c
 +++ b/net/bluetooth/bnep/netdev.c
-@@ -102,8 +102,13 @@ static void bnep_net_set_mc_list(struct
+@@ -94,8 +94,13 @@ static void bnep_net_set_mc_list(struct
                netdev_for_each_mc_addr(ha, dev) {
                        if (i == BNEP_MAX_MULTICAST_FILTERS)
                                break;