patch-2.3.16 linux/include/net/irda/irlap_frame.h

• Lines: 128
• Date: Mon Aug 30 10:30:24 1999
• Orig file: v2.3.15/linux/include/net/irda/irlap_frame.h
• Orig date: Sat Apr 24 17:50:06 1999

diff -u --recursive --new-file v2.3.15/linux/include/net/irda/irlap_frame.h linux/include/net/irda/irlap_frame.h
@@ -2,24 +2,31 @@
  *                
  * Filename:      irlap_frame.h
  * Version:       0.9
- * Description:   Build and transmit IrLAP frames
+ * Description:   IrLAP frame declarations
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Tue Aug 19 10:27:26 1997
- * Modified at:   Fri Apr 23 09:33:55 1999
+ * Modified at:   Mon Aug 23 09:38:46 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
- *     Copyright (c) 1998 Dag Brattli <dagb@cs.uit.no>, All Rights Reserved.
+ *     Copyright (c) 1997-1999 Dag Brattli <dagb@cs.uit.no>,
+ *     All Rights Reserved.
  *     
  *     This program is free software; you can redistribute it and/or 
  *     modify it under the terms of the GNU General Public License as 
  *     published by the Free Software Foundation; either version 2 of 
  *     the License, or (at your option) any later version.
- *
- *     Neither Dag Brattli nor University of Tromsų admit liability nor
- *     provide warranty for any of this software. This material is 
- *     provided "AS-IS" and at no charge.
- *
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License 
+ *     along with this program; if not, write to the Free Software 
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, 
+ *     MA 02111-1307 USA
+ *     
  ********************************************************************/
 
 #ifndef IRLAP_FRAME_H
@@ -73,7 +80,6 @@
 	__u8  flags; /* Discovery flags */
 	__u8  slotnr;
 	__u8  version;
-	__u8  discovery_info[0];
 } PACK;
 
 struct test_frame {
@@ -81,7 +87,6 @@
 	__u8 control;
 	__u32 saddr;         /* Source device address */
 	__u32 daddr;         /* Destination device address */
-	__u8 info[0];        /* Information */
 } PACK;
 
 struct ua_frame {
@@ -90,13 +95,11 @@
 
 	__u32 saddr; /* Source device address */
 	__u32 daddr; /* Dest device address */
-	__u8  params[0];
 } PACK;
 	
 struct i_frame {
 	__u8 caddr;
 	__u8 control;
-	__u8 data[0];
 } PACK;
 
 struct snrm_frame {
@@ -105,37 +108,30 @@
 	__u32 saddr;
 	__u32 daddr;
 	__u8  ncaddr;
-	__u8  params[0];
 } PACK;
 
-/* Per-packet information we need to hide inside sk_buff */
-struct irlap_skb_cb {
-	int magic; /* Be sure that we can trust the information */
-	int mtt;   /* minimum turn around time */
-	int xbofs; /* number of xbofs required */
-	int vs;    /* next frame to send */
-	int vr;    /* next frame to receive */
-};
-
-void irlap_send_discovery_xid_frame( struct irlap_cb *, int S, __u8 s, 
-				     __u8 command, discovery_t *discovery);
-void irlap_send_snrm_frame( struct irlap_cb *, struct qos_info *);
+void irlap_send_discovery_xid_frame(struct irlap_cb *, int S, __u8 s, 
+				    __u8 command, discovery_t *discovery);
+void irlap_send_snrm_frame(struct irlap_cb *, struct qos_info *);
 void irlap_send_test_frame(struct irlap_cb *self, __u32 daddr, 
 			   struct sk_buff *cmd);
-void irlap_send_ua_response_frame( struct irlap_cb *, struct qos_info *);
-void irlap_send_ui_frame( struct irlap_cb *self, struct sk_buff *skb,
-			  int command);
-void irlap_send_dm_frame( struct irlap_cb *);
-void irlap_send_disc_frame( struct irlap_cb *);
-void irlap_send_rr_frame( struct irlap_cb *, int command);
-
-void irlap_send_data_primary( struct irlap_cb *, struct sk_buff *);
-void irlap_send_data_primary_poll( struct irlap_cb *, struct sk_buff *);
-void irlap_send_data_secondary( struct irlap_cb *, struct sk_buff *);
-void irlap_send_data_secondary_final( struct irlap_cb *, struct sk_buff *);
-void irlap_resend_rejected_frames( struct irlap_cb *, int command);
+void irlap_send_ua_response_frame(struct irlap_cb *, struct qos_info *);
+void irlap_send_ui_frame(struct irlap_cb *self, struct sk_buff *skb,
+			 int command);
+void irlap_send_dm_frame(struct irlap_cb *);
+void irlap_send_disc_frame(struct irlap_cb *);
+void irlap_send_rr_frame(struct irlap_cb *, int command);
+
+void irlap_send_data_primary(struct irlap_cb *, struct sk_buff *);
+void irlap_send_data_primary_poll(struct irlap_cb *, struct sk_buff *);
+void irlap_send_data_secondary(struct irlap_cb *, struct sk_buff *);
+void irlap_send_data_secondary_final(struct irlap_cb *, struct sk_buff *);
+void irlap_resend_rejected_frames(struct irlap_cb *, int command);
+
+void irlap_send_i_frame(struct irlap_cb *, struct sk_buff *, int command);
+void irlap_send_ui_frame(struct irlap_cb *, struct sk_buff *, int command);
 
-void irlap_send_i_frame( struct irlap_cb *, struct sk_buff *, int command);
-void irlap_send_ui_frame( struct irlap_cb *, struct sk_buff *, int command);
+extern int irlap_insert_qos_negotiation_params(struct irlap_cb *self, 
+					       struct sk_buff *skb);
 
 #endif