Merge bk://kernel.bkbits.net/acme/llc-2.6

into nuts.ninka.net:/disk1/davem/BK/net-2.5

net/llc/llc_core.c

@@ -79,17 +79,14 @@ void llc_del_sap(struct llc_sap *sap)
  */
 struct llc_sap *llc_sap_find(unsigned char sap_value)
 {
-	struct llc_sap* sap = NULL;
-	struct list_head *entry;
+	struct llc_sap* sap;
 
 	read_lock_bh(&llc_sap_list_lock);
-	list_for_each(entry, &llc_sap_list) {
-		sap = list_entry(entry, struct llc_sap, node);
+	list_for_each_entry(sap, &llc_sap_list, node)
 		if (sap->laddr.lsap == sap_value)
-			break;
-	}
-	if (entry == &llc_sap_list) /* not found */
-		sap = NULL;
+			goto out;
+	sap = NULL;
+out:
 	read_unlock_bh(&llc_sap_list_lock);
 	return sap;
 }

net/llc/llc_sap.c

@@ -315,9 +315,3 @@ void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb)
 	} else
 		kfree_skb(skb);
 }
-
-EXPORT_SYMBOL(llc_save_primitive);
-EXPORT_SYMBOL(llc_build_and_send_test_pkt);
-EXPORT_SYMBOL(llc_build_and_send_ui_pkt);
-EXPORT_SYMBOL(llc_build_and_send_xid_pkt);
-EXPORT_SYMBOL(llc_sap_handler);