git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bluetooth: Add CID field to L2CAP socket address structure
[safe/jmp/linux-2.6]
/
include
/
net
/
llc.h
diff --git
a/include/net/llc.h
b/include/net/llc.h
index
93e5b44
..
7940da1
100644
(file)
--- a/
include/net/llc.h
+++ b/
include/net/llc.h
@@
-65,13
+65,12
@@
struct llc_sap {
extern struct list_head llc_sap_list;
extern rwlock_t llc_sap_list_lock;
extern struct list_head llc_sap_list;
extern rwlock_t llc_sap_list_lock;
-extern unsigned char llc_station_mac_sa[ETH_ALEN];
extern int llc_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev);
extern int llc_mac_hdr_init(struct sk_buff *skb,
extern int llc_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev);
extern int llc_mac_hdr_init(struct sk_buff *skb,
-
unsigned char *sa,
unsigned char *da);
+
const unsigned char *sa, const
unsigned char *da);
extern void llc_add_pack(int type, void (*handler)(struct llc_sap *sap,
struct sk_buff *skb));
extern void llc_add_pack(int type, void (*handler)(struct llc_sap *sap,
struct sk_buff *skb));
@@
-89,10
+88,10
@@
static inline void llc_sap_hold(struct llc_sap *sap)
atomic_inc(&sap->refcnt);
}
atomic_inc(&sap->refcnt);
}
+extern void llc_sap_close(struct llc_sap *sap);
+
static inline void llc_sap_put(struct llc_sap *sap)
{
static inline void llc_sap_put(struct llc_sap *sap)
{
- extern void llc_sap_close(struct llc_sap *sap);
-
if (atomic_dec_and_test(&sap->refcnt))
llc_sap_close(sap);
}
if (atomic_dec_and_test(&sap->refcnt))
llc_sap_close(sap);
}
@@
-102,6
+101,9
@@
extern struct llc_sap *llc_sap_find(unsigned char sap_value);
extern int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
unsigned char *dmac, unsigned char dsap);
extern int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
unsigned char *dmac, unsigned char dsap);
+extern void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb);
+extern void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb);
+
extern int llc_station_init(void);
extern void llc_station_exit(void);
extern int llc_station_init(void);
extern void llc_station_exit(void);
@@
-115,6
+117,12
@@
extern void llc_proc_exit(void);
#ifdef CONFIG_SYSCTL
extern int llc_sysctl_init(void);
extern void llc_sysctl_exit(void);
#ifdef CONFIG_SYSCTL
extern int llc_sysctl_init(void);
extern void llc_sysctl_exit(void);
+
+extern int sysctl_llc2_ack_timeout;
+extern int sysctl_llc2_busy_timeout;
+extern int sysctl_llc2_p_timeout;
+extern int sysctl_llc2_rej_timeout;
+extern int sysctl_llc_station_ack_timeout;
#else
#define llc_sysctl_init() (0)
#define llc_sysctl_exit() do { } while(0)
#else
#define llc_sysctl_init() (0)
#define llc_sysctl_exit() do { } while(0)