diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-09-18 22:14:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-09-18 22:14:48 -0700 |
| commit | b5fbb36cb06821439b5932c1b56620c0db580237 (patch) | |
| tree | 19835bfe98169e5194af0e7d6944ec0fd8cdadb0 /include/net | |
| parent | 8188258ccab58a99b9e4bf16e9cbfe0b704b628c (diff) | |
| parent | 2ecd16f0147c6e8cd2299882a5dfb367e06e188b (diff) | |
Merge master.kernel.org:/home/acme/BK/llc-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/llc_actn.h | 1 | ||||
| -rw-r--r-- | include/net/llc_c_ac.h | 5 | ||||
| -rw-r--r-- | include/net/llc_c_ev.h | 9 | ||||
| -rw-r--r-- | include/net/llc_main.h | 2 |
4 files changed, 16 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_c_ev.h b/include/net/llc_c_ev.h index 5fe315ebcc7c..795cb74166a5 100644 --- a/include/net/llc_c_ev.h +++ b/include/net/llc_c_ev.h @@ -11,6 +11,9 @@ * * See the GNU General Public License for more details. */ + +#include <net/sock.h> + /* Connection component state transition event qualifiers */ /* Types of events (possible values in 'ev->type') */ #define LLC_CONN_EV_TYPE_SIMPLE 1 @@ -293,4 +296,10 @@ extern int llc_conn_ev_qlfy_set_status_conflict(struct sock *sk, struct sk_buff *skb); extern int llc_conn_ev_qlfy_set_status_rst_done(struct sock *sk, struct sk_buff *skb); + +static __inline__ int llc_conn_space(struct sock *sk, struct sk_buff *skb) +{ + return atomic_read(&sk->rmem_alloc) + skb->truesize < + (unsigned)sk->rcvbuf; +} #endif /* LLC_C_EV_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 */ |