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

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

net/llc/Makefile

@@ -2,7 +2,7 @@
 # Makefile for the Linux 802.2 LLC (fully-functional) layer.
 #
 # Copyright (c) 1997 by Procom Technology,Inc.
-#		2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+#		2001, 2002 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
 #
 # This program can be redistributed or modified under the terms of the 
 # GNU General Public License as published by the Free Software Foundation.
@@ -17,7 +17,7 @@ obj-$(CONFIG_LLC) += llc.o
 llc-y := llc_if.o llc_c_ev.o llc_c_ac.o llc_mac.o llc_sap.o llc_s_st.o \
 	 llc_main.o llc_s_ac.o llc_conn.o llc_c_st.o llc_stat.o llc_actn.o \
 	 llc_s_ev.o llc_evnt.o llc_pdu.o
-llc-$(CONFIG_LLC_UI)	+= llc_sock.o
+llc-$(CONFIG_LLC_UI)	+= af_llc.o
 llc-objs	 	:= $(llc-y)
 
 # Objects that export symbols.

net/llc/llc_sock.c → net/llc/af_llc.c

 /*
- * llc_sock.c - LLC User Interface SAPs
+ * af_llc.c - LLC User Interface SAPs
  * Description:
  *   Functions in this module are implementation of socket based llc
  *   communications for the Linux operating system. Support of llc class