summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@conectiva.com.br>2002-09-18 16:40:38 -0300
committerDavid S. Miller <davem@nuts.ninka.net>2002-09-18 16:40:38 -0300
commitd3007e37f0a69fef521c10b247b3a8a57cd56666 (patch)
treea7fbf7d734f1d6efc3cf5ee4e5ec177d5247b886 /include/net
parent78a10cc536ff75e2fa3e791deb2d2d06f8e7b3f9 (diff)
[LLC] timer cleanup: use mod_timer
. Use a smaller default for LLC_ACK_TIME. . Added much more info about core sock internal state in /proc/net/802.2
Diffstat (limited to 'include/net')
-rw-r--r--include/net/llc_actn.h1
-rw-r--r--include/net/llc_c_ac.h5
-rw-r--r--include/net/llc_main.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/include/net/llc_actn.h b/include/net/llc_actn.h
index 28d2873f5065..3619601c4c81 100644
--- a/include/net/llc_actn.h
+++ b/include/net/llc_actn.h
@@ -45,4 +45,5 @@ extern int llc_station_ac_report_status(struct llc_station *station,
struct sk_buff *skb);
extern int llc_station_ac_report_status(struct llc_station *station,
struct sk_buff *skb);
+extern void llc_station_ack_tmr_cb(unsigned long timeout_data);
#endif /* LLC_ACTN_H */
diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
index 1d2facdf212b..221899a24530 100644
--- a/include/net/llc_c_ac.h
+++ b/include/net/llc_c_ac.h
@@ -211,4 +211,9 @@ extern int llc_conn_ac_send_i_rsp_f_set_ackpf(struct sock* sk,
struct sk_buff *skb);
extern int llc_conn_ac_send_i_rsp_as_ack(struct sock* sk, struct sk_buff *skb);
extern int llc_conn_ac_send_i_as_ack(struct sock* sk, struct sk_buff *skb);
+
+extern void llc_conn_busy_tmr_cb(unsigned long timeout_data);
+extern void llc_conn_pf_cycle_tmr_cb(unsigned long timeout_data);
+extern void llc_conn_ack_tmr_cb(unsigned long timeout_data);
+extern void llc_conn_rej_tmr_cb(unsigned long timeout_data);
#endif /* LLC_C_AC_H */
diff --git a/include/net/llc_main.h b/include/net/llc_main.h
index e3b0c7a09caa..25d486278da4 100644
--- a/include/net/llc_main.h
+++ b/include/net/llc_main.h
@@ -16,7 +16,7 @@
#define LLC_TYPE_1 1
#define LLC_TYPE_2 2
#define LLC_P_TIME 2
-#define LLC_ACK_TIME 3
+#define LLC_ACK_TIME 1
#define LLC_REJ_TIME 3
#define LLC_BUSY_TIME 3
#define LLC_DEST_INVALID 0 /* Invalid LLC PDU type */