Merge master.kernel.org:/home/acme/BK/llc-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

4 files changed, 3 insertions, 8 deletions

diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
index 795cb74166a5..2a8a0be9040b 100644
--- a/include/net/llc_c_ev.h
+++ b/include/net/llc_c_ev.h
@@ -126,7 +126,6 @@ struct llc_conn_ev_prim_if {
 /* Event LLC_CONN_EV_TYPE_PDU interface */
 struct llc_conn_ev_pdu_if {
 	u8 ev;
-	u8 reason;
 };
 
 union llc_conn_ev_if {
@@ -137,6 +136,7 @@ union llc_conn_ev_if {
 
 struct llc_conn_state_ev {
 	u8			  type;
+	u8			  reason;
 	u8			  status;
 	u8			  flag;
 	struct llc_prim_if_block *ind_prim;
diff --git a/include/net/llc_evnt.h b/include/net/llc_evnt.h
index b521be2a5582..82bca6d937d6 100644
--- a/include/net/llc_evnt.h
+++ b/include/net/llc_evnt.h
@@ -41,18 +41,14 @@ struct llc_stat_ev_prim_if {
 	u8 type; /* request, indicate, response, confirm */
 };
 
-struct llc_stat_ev_pdu_if {
-	u8 reason;
-};
-
 union llc_stat_ev_if {
 	struct llc_stat_ev_simple_if  a;	/* 'a' for simple, easy ... */
 	struct llc_stat_ev_prim_if    prim;
-	struct llc_stat_ev_pdu_if     pdu;
 };
 
 struct llc_station_state_ev {
 	u8		     type;
+	u8		     reason;
 	union llc_stat_ev_if data;
 	struct list_head     node; /* node in station->ev_q.list */
 };
diff --git a/include/net/llc_if.h b/include/net/llc_if.h
index b6f50717dd5c..5ae7edc13649 100644
--- a/include/net/llc_if.h
+++ b/include/net/llc_if.h
@@ -70,7 +70,6 @@ struct llc_addr {
 struct llc_prim_reset {
 	struct sock *sk;
 	u16	     link;
-	u8	     reason;		/* used only by indicate */
 };
 
  /* Sending data in conection-less mode */
diff --git a/include/net/llc_s_ev.h b/include/net/llc_s_ev.h
index c1f124f9d3c8..530042ae2be4 100644
--- a/include/net/llc_s_ev.h
+++ b/include/net/llc_s_ev.h
@@ -49,7 +49,6 @@ struct llc_sap_ev_prim_if {
 
 struct llc_sap_ev_pdu_if {
 	u8 ev;
-	u8 reason;
 };
 
 union llc_sap_ev_if {
@@ -62,6 +61,7 @@ struct llc_prim_if_block;
 
 struct llc_sap_state_ev {
 	u8			  type;
+	u8			  reason;
 	u8			  ind_cfm_flag;
 	struct llc_prim_if_block *prim;
 	union llc_sap_ev_if	  data;