Bluetooth: Fix race condition with L2CAP information request

[safe/jmp/linux-2.6] / include / net / rose.h

diff --git a/include/net/rose.h b/include/net/rose.h
index 3249b97..cbd5364 100644 (file)
--- a/include/net/rose.h
+++ b/include/net/rose.h
@@ -49,14 +49,14 @@ enum {
        ROSE_STATE_5                    /* Deferred Call Acceptance */
 };
 
-#define ROSE_DEFAULT_T0                        (180 * HZ)      /* Default T10 T20 value */
-#define ROSE_DEFAULT_T1                        (200 * HZ)      /* Default T11 T21 value */
-#define ROSE_DEFAULT_T2                        (180 * HZ)      /* Default T12 T22 value */
-#define        ROSE_DEFAULT_T3                 (180 * HZ)      /* Default T13 T23 value */
-#define        ROSE_DEFAULT_HB                 (5 * HZ)        /* Default Holdback value */
-#define        ROSE_DEFAULT_IDLE               (0 * 60 * HZ)   /* No Activity Timeout - none */
+#define ROSE_DEFAULT_T0                        180000          /* Default T10 T20 value */
+#define ROSE_DEFAULT_T1                        200000          /* Default T11 T21 value */
+#define ROSE_DEFAULT_T2                        180000          /* Default T12 T22 value */
+#define        ROSE_DEFAULT_T3                 180000          /* Default T13 T23 value */
+#define        ROSE_DEFAULT_HB                 5000            /* Default Holdback value */
+#define        ROSE_DEFAULT_IDLE               0               /* No Activity Timeout - none */
 #define        ROSE_DEFAULT_ROUTING            1               /* Default routing flag */
-#define        ROSE_DEFAULT_FAIL_TIMEOUT       (120 * HZ)      /* Time until link considered usable */
+#define        ROSE_DEFAULT_FAIL_TIMEOUT       120000          /* Time until link considered usable */
 #define        ROSE_DEFAULT_MAXVC              50              /* Maximum number of VCs per neighbour */
 #define        ROSE_DEFAULT_WINDOW_SIZE        7               /* Default window size */
 
@@ -189,19 +189,19 @@ extern void rose_enquiry_response(struct sock *);
 
 /* rose_route.c */
 extern struct rose_neigh *rose_loopback_neigh;
-extern struct file_operations rose_neigh_fops;
-extern struct file_operations rose_nodes_fops;
-extern struct file_operations rose_routes_fops;
+extern const struct file_operations rose_neigh_fops;
+extern const struct file_operations rose_nodes_fops;
+extern const struct file_operations rose_routes_fops;
 
-extern int  rose_add_loopback_neigh(void);
-extern int  rose_add_loopback_node(rose_address *);
+extern void rose_add_loopback_neigh(void);
+extern int __must_check rose_add_loopback_node(rose_address *);
 extern void rose_del_loopback_node(rose_address *);
 extern void rose_rt_device_down(struct net_device *);
 extern void rose_link_device_down(struct net_device *);
 extern struct net_device *rose_dev_first(void);
 extern struct net_device *rose_dev_get(rose_address *);
 extern struct rose_route *rose_route_free_lci(unsigned int, struct rose_neigh *);
-extern struct rose_neigh *rose_get_neigh(rose_address *, unsigned char *, unsigned char *);
+extern struct rose_neigh *rose_get_neigh(rose_address *, unsigned char *, unsigned char *, int);
 extern int  rose_rt_ioctl(unsigned int, void __user *);
 extern void rose_link_failed(ax25_cb *, int);
 extern int  rose_route_frame(struct sk_buff *, ax25_cb *);