Merge branch 'from-linus' into upstream

2006-05-26 16:06:58 -04:00
parent df8ccb9bf1 705af30950
commit f587fb74b2
56 changed files with 389 additions and 177 deletions
@@ -112,7 +112,7 @@ struct lsap_cb {

 	struct timer_list watchdog_timer;

-	IRLMP_STATE     lsap_state;  /* Connection state */
+	LSAP_STATE      lsap_state;  /* Connection state */
 	notify_t        notify;      /* Indication/Confirm entry points */
 	struct qos_info qos;         /* QoS for this connection */