patch-2.3.14 linux/include/linux/cyclomx.h

Next file: linux/include/linux/cycx_drv.h
Previous file: linux/include/linux/concap.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/include/linux/cyclomx.h linux/include/linux/cyclomx.h
@@ -56,8 +56,7 @@
 	spinlock_t lock;
 	char in_isr;			/* interrupt-in-service flag */
 	char buff_int_mode_unbusy;      /* flag for carrying out dev_tint */
-	u16 irq_dis_if_send_count;	/* Disabling irqs in if_send*/
-#if LINUX_VERSION_CODE >= 0x020300
+#if (LINUX_VERSION_CODE >= 0x20300)
 	wait_queue_head_t wait_stats;  /* to wait for the STATS indication */
 #else
 	struct wait_queue* wait_stats;  /* to wait for the STATS indication */
@@ -73,7 +72,7 @@
 			u32 lo_svc;
 			u32 hi_svc;
 			TX25Stats stats;
-			unsigned critical;	/* critical section flag */
+			spinlock_t lock;
 			u32 connection_keys;
 		} x;
 #endif
@@ -81,12 +80,12 @@
 } cycx_t;
 
 /* Public Functions */
-void cyclomx_open      (cycx_t* card);			/* cycx_main.c */
-void cyclomx_close     (cycx_t* card);			/* cycx_main.c */
-void cyclomx_set_state (cycx_t* card, int state);	/* cycx_main.c */
+void cyclomx_open      (cycx_t *card);			/* cycx_main.c */
+void cyclomx_close     (cycx_t *card);			/* cycx_main.c */
+void cyclomx_set_state (cycx_t *card, int state);	/* cycx_main.c */
 
 #ifdef CONFIG_CYCLOMX_X25
-int cyx_init (cycx_t* card, wandev_conf_t* conf);	/* cycx_x25.c */
+int cyx_init (cycx_t *card, wandev_conf_t *conf);	/* cycx_x25.c */
 #endif
 #endif	/* __KERNEL__ */
 #endif	/* _CYCLOMX_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)