summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-08-23 12:28:19 +0200
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-08-27 11:57:29 -0700
commit9c06fde72f9f44697a9f18c79a94ca007e20c141 (patch)
tree51cc915665e80108d9763549c5738abae735bb0f /patches/collateral-evolutions/network
parent24b93fb791995edfe7544495996f86714350eaa5 (diff)
backport: backport device_move() properly
This was causing conflicts again when updating against wireless-next, so instead of adjusting the patches just provide a proper static inline backport. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches/collateral-evolutions/network')
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch12
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch25
2 files changed, 0 insertions, 37 deletions
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 4def823e..b4f7b1d5 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
@@ -12,18 +12,6 @@
&bt_link_group,
NULL
};
-@@ -141,7 +145,11 @@ void hci_conn_del_sysfs(struct hci_conn
- dev = device_find_child(&conn->dev, NULL, __match_tty);
- if (!dev)
- break;
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29))
- device_move(dev, NULL, DPM_ORDER_DEV_LAST);
-+#else
-+ device_move(dev, NULL);
-+#endif
- put_device(dev);
- }
-
@@ -378,7 +386,11 @@ static struct attribute_group bt_host_gr
.attrs = bt_host_attrs,
};
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 7653c0ba..dac5ace5 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,30 +1,5 @@
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
-@@ -708,8 +708,12 @@ static int rfcomm_tty_open(struct tty_st
- remove_wait_queue(&dev->wait, &wait);
-
- if (err == 0)
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29))
- device_move(dev->tty_dev, rfcomm_get_device(dev),
- DPM_ORDER_DEV_AFTER_PARENT);
-+#else
-+ device_move(dev->tty_dev, rfcomm_get_device(dev));
-+#endif
-
- rfcomm_tty_copy_pending(dev);
-
-@@ -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)
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29))
- device_move(dev->tty_dev, NULL, DPM_ORDER_DEV_LAST);
-+#else
-+ device_move(dev->tty_dev, NULL);
-+#endif
-
- /* Close DLC and dettach TTY */
- rfcomm_dlc_close(dev->dlc, 0);
@@ -809,7 +817,11 @@ static int rfcomm_tty_write_room(struct
return room;
}