summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@conectiva.com.br>2002-09-11 19:11:07 -0300
committerArnaldo Carvalho de Melo <acme@conectiva.com.br>2002-09-11 19:11:07 -0300
commit7282621067bc47d470b87e17c1ecf92a4d26b19e (patch)
treeb9826500e3dd3b054cf661b9a0a2ab48d947fd78 /include/net
parent209fb681d4d4715885b0a9c01418d78a30c1cba4 (diff)
[LLC] llc_establish_connection & LLC_CONN_PRIM bits the bucket
. Bzzzt, rest in peace LLC_DATA_PRIM. We won't miss you. . In the process I also killed sap->resp and all of the functions it was calling, the Procom guys left this in the codebase but _nobody_ was actually using it.
Diffstat (limited to 'include/net')
-rw-r--r--include/net/llc_if.h14
-rw-r--r--include/net/llc_sap.h2
2 files changed, 2 insertions, 14 deletions
diff --git a/include/net/llc_if.h b/include/net/llc_if.h
index e294c1d976b1..86cf648b7872 100644
--- a/include/net/llc_if.h
+++ b/include/net/llc_if.h
@@ -66,17 +66,6 @@ struct llc_addr {
};
/* Primitive-specific data */
-struct llc_prim_conn {
- struct llc_addr saddr; /* used by request only */
- struct llc_addr daddr; /* used by request only */
- u8 status; /* reason for failure */
- u8 pri; /* service_class */
- struct net_device *dev;
- struct sock *sk; /* returned from REQUEST */
- u16 link;
- struct sk_buff *skb; /* received SABME */
-};
-
struct llc_prim_disc {
struct sock *sk;
u16 link;
@@ -119,7 +108,6 @@ struct llc_prim_test {
};
union llc_u_prim_data {
- struct llc_prim_conn conn;
struct llc_prim_disc disc;
struct llc_prim_reset res;
struct llc_prim_flow_ctrl fc;
@@ -142,5 +130,7 @@ extern struct llc_sap *llc_sap_open(llc_prim_call_t network_indicate,
llc_prim_call_t network_confirm, u8 lsap);
extern void llc_sap_close(struct llc_sap *sap);
+extern int llc_establish_connection(struct sock *sk, u8 *lmac,
+ u8 *dmac, u8 dsap);
extern int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb);
#endif /* LLC_IF_H */
diff --git a/include/net/llc_sap.h b/include/net/llc_sap.h
index cabd5a8ed9f2..3132bebd1422 100644
--- a/include/net/llc_sap.h
+++ b/include/net/llc_sap.h
@@ -18,7 +18,6 @@
* @p_bit - only lowest-order bit used
* @f_bit - only lowest-order bit used
* @req - provided by LLC layer
- * @resp - provided by LLC layer
* @ind - provided by network layer
* @conf - provided by network layer
* @laddr - SAP value in this 'lsap'
@@ -32,7 +31,6 @@ struct llc_sap {
u8 p_bit;
u8 f_bit;
llc_prim_call_t req;
- llc_prim_call_t resp;
llc_prim_call_t ind;
llc_prim_call_t conf;
struct llc_prim_if_block llc_ind_prim, llc_cfm_prim;