From 30498b130cc0476e73f5142dcc63bc271da2d89b Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 5 Apr 2013 00:29:26 +0200 Subject: refresh patches against next-20130328 The patches were last refreshed against that same tree, so the only change is that now we have -p in there, which results in changes like this (only): -@@ -1593,7 +1593,7 @@ +@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_ This makes the patches more readable. Signed-off-by: Johannes Berg --- .../16-bluetooth/drivers_bluetooth_hci_ldisc.patch | 4 ++-- .../16-bluetooth/net_bluetooth_af_bluetooth.patch | 6 +++--- .../16-bluetooth/net_bluetooth_bnep_sock.patch | 2 +- .../16-bluetooth/net_bluetooth_cmtp_capi.patch | 2 +- .../16-bluetooth/net_bluetooth_cmtp_sock.patch | 2 +- .../16-bluetooth/net_bluetooth_hci_sock.patch | 4 ++-- .../16-bluetooth/net_bluetooth_hci_sysfs.patch | 6 +++--- .../16-bluetooth/net_bluetooth_hidp_core.patch | 22 +++++++++++----------- .../16-bluetooth/net_bluetooth_hidp_sock.patch | 2 +- .../16-bluetooth/net_bluetooth_l2cap_sock.patch | 6 +++--- .../16-bluetooth/net_bluetooth_rfcomm_sock.patch | 4 ++-- .../16-bluetooth/net_bluetooth_rfcomm_tty.patch | 10 +++++----- .../network/16-bluetooth/net_bluetooth_sco.patch | 4 ++-- 13 files changed, 37 insertions(+), 37 deletions(-) (limited to 'patches/collateral-evolutions/network/16-bluetooth') diff --git a/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch b/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch index 5248d2d6..5d5fd922 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c -@@ -297,8 +297,13 @@ +@@ -297,8 +297,13 @@ static int hci_uart_tty_open(struct tty_ /* FIXME: why is this needed. Note don't use ldisc_ref here as the open path is before the ldisc is referencable */ @@ -14,7 +14,7 @@ tty_driver_flush_buffer(tty); return 0; -@@ -524,7 +529,11 @@ +@@ -524,7 +529,11 @@ static int hci_uart_tty_ioctl(struct tty return hu->hdev_flags; default: diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch index 019bf549..8607e2ea 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c -@@ -103,8 +103,12 @@ +@@ -103,8 +103,12 @@ void bt_sock_unregister(int proto) } EXPORT_SYMBOL(bt_sock_unregister); @@ -13,7 +13,7 @@ { int err; -@@ -122,7 +126,11 @@ +@@ -122,7 +126,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)) { @@ -25,7 +25,7 @@ if (!err) bt_sock_reclassify_lock(sock->sk, proto); module_put(bt_proto[proto]->owner); -@@ -455,7 +463,11 @@ +@@ -455,7 +463,11 @@ int bt_sock_ioctl(struct socket *sock, u if (sk->sk_state == BT_LISTEN) return -EINVAL; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch index 1b6a5cae..3e9c40fe 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_bnep_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/bnep/sock.c +++ b/net/bluetooth/bnep/sock.c -@@ -186,8 +186,12 @@ +@@ -186,8 +186,12 @@ static struct proto bnep_proto = { .obj_size = sizeof(struct bt_sock) }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_capi.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_capi.patch index 25a51dcc..0b7a6e3d 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_capi.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_capi.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/cmtp/capi.c +++ b/net/bluetooth/cmtp/capi.c -@@ -384,7 +384,11 @@ +@@ -384,7 +384,11 @@ static void cmtp_reset_ctr(struct capi_c BT_DBG("ctrl %p", ctrl); diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch index d2ad2515..24b93553 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_cmtp_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/cmtp/sock.c +++ b/net/bluetooth/cmtp/sock.c -@@ -195,8 +195,12 @@ +@@ -195,8 +195,12 @@ static struct proto cmtp_proto = { .obj_size = sizeof(struct bt_sock) }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch index 9f7a573e..923c718f 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c -@@ -884,8 +884,13 @@ +@@ -884,8 +884,13 @@ drop: goto done; } @@ -14,7 +14,7 @@ { struct hci_ufilter uf = { .opcode = 0 }; struct sock *sk = sock->sk; -@@ -1059,8 +1064,12 @@ +@@ -1059,8 +1064,12 @@ static struct proto hci_sk_proto = { .obj_size = sizeof(struct hci_pinfo) }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch index df664bdc..ac74a0e5 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c -@@ -72,7 +72,11 @@ +@@ -72,7 +72,11 @@ static struct attribute_group bt_link_gr .attrs = bt_link_attrs, }; @@ -12,7 +12,7 @@ &bt_link_group, NULL }; -@@ -141,7 +145,11 @@ +@@ -141,7 +145,11 @@ void hci_conn_del_sysfs(struct hci_conn dev = device_find_child(&conn->dev, NULL, __match_tty); if (!dev) break; @@ -24,7 +24,7 @@ put_device(dev); } -@@ -379,7 +387,11 @@ +@@ -379,7 +387,11 @@ static struct attribute_group bt_host_gr .attrs = bt_host_attrs, }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch index 8970690b..f5462670 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c -@@ -383,6 +383,7 @@ +@@ -383,6 +383,7 @@ err: return ret; } @@ -8,7 +8,7 @@ static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count, unsigned char report_type) { -@@ -441,6 +442,16 @@ +@@ -441,6 +442,16 @@ err: mutex_unlock(&session->report_mutex); return ret; } @@ -25,7 +25,7 @@ static void hidp_idle_timeout(unsigned long arg) { -@@ -743,8 +754,14 @@ +@@ -743,8 +754,14 @@ static int hidp_session(void *arg) } if (session->hid) { @@ -40,7 +40,7 @@ } /* Wakeup user-space polling for socket errors */ -@@ -855,6 +872,70 @@ +@@ -855,6 +872,70 @@ static void hidp_close(struct hid_device { } @@ -111,7 +111,7 @@ static int hidp_parse(struct hid_device *hid) { struct hidp_session *session = hid->driver_data; -@@ -946,7 +1027,9 @@ +@@ -946,7 +1027,9 @@ static int hidp_setup_hid(struct hidp_se hid->dev.parent = &session->conn->dev; hid->ll_driver = &hidp_hid_driver; @@ -121,7 +121,7 @@ hid->hid_output_raw_report = hidp_output_raw_report; /* True if device is blacklisted in drivers/hid/hid-core.c */ -@@ -964,6 +1047,7 @@ +@@ -964,6 +1047,7 @@ fault: return err; } @@ -129,7 +129,7 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock) { -@@ -979,6 +1063,39 @@ +@@ -979,6 +1063,39 @@ int hidp_add_connection(struct hidp_conn BT_DBG("rd_data %p rd_size %d", req->rd_data, req->rd_size); @@ -169,7 +169,7 @@ down_write(&hidp_session_sem); s = __hidp_get_session(&bt_sk(ctrl_sock->sk)->dst); -@@ -1026,6 +1143,7 @@ +@@ -1026,6 +1143,7 @@ int hidp_add_connection(struct hidp_conn __hidp_link_session(session); @@ -177,7 +177,7 @@ if (req->rd_size > 0) { err = hidp_setup_hid(session, req); if (err && err != -ENODEV) -@@ -1037,6 +1155,16 @@ +@@ -1037,6 +1155,16 @@ int hidp_add_connection(struct hidp_conn if (err < 0) goto purge; } @@ -194,7 +194,7 @@ hidp_set_timer(session); -@@ -1095,6 +1223,7 @@ +@@ -1095,6 +1223,7 @@ unlink: session->input = NULL; } @@ -202,7 +202,7 @@ if (session->hid) { hid_destroy_device(session->hid); session->hid = NULL; -@@ -1108,10 +1237,15 @@ +@@ -1108,10 +1237,15 @@ purge: skb_queue_purge(&session->ctrl_transmit); skb_queue_purge(&session->intr_transmit); diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch index 9658f2b2..b7bb6531 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/hidp/sock.c +++ b/net/bluetooth/hidp/sock.c -@@ -235,8 +235,12 @@ +@@ -235,8 +235,12 @@ static struct proto hidp_proto = { .obj_size = sizeof(struct bt_sock) }; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch index 56e920be..6a155d58 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c -@@ -573,8 +573,13 @@ +@@ -573,8 +573,13 @@ static int l2cap_sock_setsockopt_old(str return err; } @@ -14,7 +14,7 @@ { struct sock *sk = sock->sk; struct l2cap_chan *chan = l2cap_pi(sk)->chan; -@@ -1225,8 +1230,12 @@ +@@ -1225,8 +1230,12 @@ static struct sock *l2cap_sock_alloc(str return sk; } @@ -27,7 +27,7 @@ { struct sock *sk; -@@ -1238,7 +1247,11 @@ +@@ -1238,7 +1247,11 @@ static int l2cap_sock_create(struct net sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch index 6aa1e848..fbeb1073 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c -@@ -304,8 +304,13 @@ +@@ -304,8 +304,13 @@ static struct sock *rfcomm_sock_alloc(st return sk; } @@ -14,7 +14,7 @@ { struct sock *sk; -@@ -660,7 +665,11 @@ +@@ -660,7 +665,11 @@ static int rfcomm_sock_setsockopt_old(st return err; } diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch index 957122ec..7653c0ba 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c -@@ -708,8 +708,12 @@ +@@ -708,8 +708,12 @@ static int rfcomm_tty_open(struct tty_st remove_wait_queue(&dev->wait, &wait); if (err == 0) @@ -13,7 +13,7 @@ rfcomm_tty_copy_pending(dev); -@@ -733,7 +737,11 @@ +@@ -733,7 +737,11 @@ static void rfcomm_tty_close(struct tty_ if (!--dev->port.count) { spin_unlock_irqrestore(&dev->port.lock, flags); if (dev->tty_dev->parent) @@ -25,7 +25,7 @@ /* Close DLC and dettach TTY */ rfcomm_dlc_close(dev->dlc, 0); -@@ -809,7 +817,11 @@ +@@ -809,7 +817,11 @@ static int rfcomm_tty_write_room(struct return room; } @@ -37,7 +37,7 @@ { BT_DBG("tty %p cmd 0x%02x", tty, cmd); -@@ -1068,7 +1080,11 @@ +@@ -1068,7 +1080,11 @@ static void rfcomm_tty_hangup(struct tty } } @@ -49,7 +49,7 @@ { struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; -@@ -1077,7 +1093,11 @@ +@@ -1077,7 +1093,11 @@ static int rfcomm_tty_tiocmget(struct tt return dev->modem_status; } diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch index 004869ae..6b6d9a5d 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c -@@ -423,8 +423,12 @@ +@@ -423,8 +423,12 @@ static struct sock *sco_sock_alloc(struc return sk; } @@ -13,7 +13,7 @@ { struct sock *sk; -@@ -675,7 +679,11 @@ +@@ -675,7 +679,11 @@ static int sco_sock_recvmsg(struct kiocb return bt_sock_recvmsg(iocb, sock, msg, len, flags); } -- cgit v1.2.3