git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
net
/
bluetooth
/
hci_core.h
diff --git
a/include/net/bluetooth/hci_core.h
b/include/net/bluetooth/hci_core.h
index
6d63a47
..
bb9f81d
100644
(file)
--- a/
include/net/bluetooth/hci_core.h
+++ b/
include/net/bluetooth/hci_core.h
@@
-25,7
+25,6
@@
#ifndef __HCI_CORE_H
#define __HCI_CORE_H
#ifndef __HCI_CORE_H
#define __HCI_CORE_H
-#include <linux/proc_fs.h>
#include <net/bluetooth/hci.h>
/* HCI upper protocols */
#include <net/bluetooth/hci.h>
/* HCI upper protocols */
@@
-34,8
+33,6
@@
#define HCI_INIT_TIMEOUT (HZ * 10)
#define HCI_INIT_TIMEOUT (HZ * 10)
-extern struct proc_dir_entry *proc_bt_hci;
-
/* HCI Core structures */
struct inquiry_data {
/* HCI Core structures */
struct inquiry_data {
@@
-44,7
+41,7
@@
struct inquiry_data {
__u8 pscan_period_mode;
__u8 pscan_mode;
__u8 dev_class[3];
__u8 pscan_period_mode;
__u8 pscan_mode;
__u8 dev_class[3];
- __
u16
clock_offset;
+ __
le16
clock_offset;
__s8 rssi;
};
__s8 rssi;
};
@@
-126,10
+123,6
@@
struct hci_dev {
atomic_t promisc;
atomic_t promisc;
-#ifdef CONFIG_PROC_FS
- struct proc_dir_entry *proc;
-#endif
-
struct class_device class_dev;
struct module *owner;
struct class_device class_dev;
struct module *owner;
@@
-404,7
+397,7
@@
static inline int hci_recv_frame(struct sk_buff *skb)
bt_cb(skb)->incoming = 1;
/* Time stamp */
bt_cb(skb)->incoming = 1;
/* Time stamp */
-
do_gettimeofday(&skb->stamp
);
+
__net_timestamp(skb
);
/* Queue frame for rx task */
skb_queue_tail(&hdev->rx_q, skb);
/* Queue frame for rx task */
skb_queue_tail(&hdev->rx_q, skb);