[cgl_discussion] [TIPC][PATCH] Build fixes for latest Mika patch

Rusty Lynch rusty at linux.co.intel.com
Thu Mar 13 15:14:00 PST 2003


Mika, your last patch (patch_093_r4_to_094_r1.diff) will not build.
Here is a quick fix that:

* fixes Makefile to not try and build the non-existing Bearer.c and Link.c
* undo your function name change for bearer_stop since 
  1) the new name already exist in Manager.c
  2) the one place that called it was still calling the old name
  
BTW, I alreay pushed the changes to the tree. Hope you don't mind :->

    --rustyl

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1105  -> 1.1106 
#	   net/tipc/Makefile	1.2     -> 1.3    
#	   net/tipc/bearer.c	1.4     -> 1.5    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/03/13	rusty at penguin.co.intel.com	1.1106
# Fix problems from the last changeset:
# 1) let Makefile know of filename changes
# 2) undo function name change since none of the rest of the 
#    code knows about it
# --------------------------------------------
#
diff -Nru a/net/tipc/Makefile b/net/tipc/Makefile
--- a/net/tipc/Makefile	Thu Mar 13 15:16:27 2003
+++ b/net/tipc/Makefile	Thu Mar 13 15:16:27 2003
@@ -7,7 +7,7 @@
 tipc-y			+= init.o
 tipc-y			+= udp_bearer.o socket_adapter.o
 
-tipc-y			+= Address.o Bearer.o Link.o tipc_core.o \
+tipc-y			+= Address.o bearer.o link.o tipc_core.o \
 			LinkSubscription.o Manager.o Memory.o \
 			NameDistributor.o NameSubscription.o NameTable.o \
 			Network.o NetworkSubscription.o Port.o Processor.o \
diff -Nru a/net/tipc/bearer.c b/net/tipc/bearer.c
--- a/net/tipc/bearer.c	Thu Mar 13 15:16:27 2003
+++ b/net/tipc/bearer.c	Thu Mar 13 15:16:27 2003
@@ -547,7 +547,7 @@
 /* ////////////////////////////////////////////////////////////// */
 
 void
-tipc_stop_bearers(void)
+bearer_stop(void)
 {
 	uint i;
 





More information about the cgl_discussion mailing list