patch-1.3.6 linux/include/net/ax25.h

• Lines: 20
• Date: Thu Jun 29 19:18:51 1995
• Orig file: v1.3.5/linux/include/net/ax25.h
• Orig date: Tue Jun 6 11:22:17 1995

diff -u --recursive --new-file v1.3.5/linux/include/net/ax25.h linux/include/net/ax25.h
@@ -114,7 +114,7 @@
 	struct device		*device;
 	unsigned char		state;
 	unsigned short		vs, vr, va;
-	unsigned char		condition;
+	unsigned char		condition, backoff;
 	unsigned char		n2, n2count;
 	unsigned short		t1, t2, t3, rtt;
 	unsigned short		t1timer, t2timer, t3timer;
@@ -133,8 +133,8 @@
 extern int  ax25_rcv(struct sk_buff *,struct device *,struct packet_type *);
 extern void ax25_destroy_socket(ax25_cb *);
 extern struct device *ax25rtr_get_dev(ax25_address *);
-extern int  ax25_encapsulate(unsigned char *, struct device *, unsigned short,
-	void *, void *, unsigned int, struct sk_buff *);
+extern int  ax25_encapsulate(struct sk_buff *, struct device *, unsigned short,
+	void *, void *, unsigned int);
 extern int  ax25_rebuild_header(unsigned char *, struct device *, unsigned long, struct sk_buff *);
 extern int  ax25_get_info(char *, char **, off_t, int);
 extern ax25_uid_assoc *ax25_uid_list;