X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=blobdiff_plain;f=net%2Fllc%2Fllc_conn.c;h=4c644bc70eaec7b4a9f3f11d55f603afd72922b0;hp=eba812a9c69c6e0e0de271b5ec275d696da8e52d;hb=e0dd55190ff8c6485a721c9473ded92d03c0fe01;hpb=1da177e4c3f41524e886b7f1b8a0c1fc7321cac2;ds=sidebyside

diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index eba812a9c69..4c644bc70ea 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -16,7 +16,7 @@
 #include <net/llc_sap.h>
 #include <net/llc_conn.h>
 #include <net/sock.h>
-#include <linux/tcp.h>
+#include <net/tcp_states.h>
 #include <net/llc_c_ev.h>
 #include <net/llc_c_ac.h>
 #include <net/llc_c_st.h>
@@ -71,7 +71,11 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
 
 	if (!ev->ind_prim && !ev->cfm_prim) {
 		/* indicate or confirm not required */
-		if (!skb->list)
+		/* XXX this is not very pretty, perhaps we should store
+		 * XXX indicate/confirm-needed state in the llc_conn_state_ev
+		 * XXX control block of the SKB instead? -DaveM
+		 */
+		if (!skb->next)
 			goto out_kfree_skb;
 		goto out_skb_put;
 	}