Skip to contentSkip to conversation

tipc: do not add socket.o to tipc-y twice

PATCH Applied Masahiro Yamada 2 participants 4 messages Jan 6, 2020 – Jan 8, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 tipc: do not add socket.o to tipc-y twice

net/tipc/Makefile adds socket.o twice.

tipc-y	+= addr.o bcast.o bearer.o \
           core.o link.o discover.o msg.o  \
           name_distr.o  subscr.o monitor.o name_table.o net.o  \
           netlink.o netlink_compat.o node.o socket.o eth_media.o \
                                             ^^^^^^^^
           topsrv.o socket.o group.o trace.o
                    ^^^^^^^^

---

 net/tipc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/tipc/Makefile +1 -1
index 11255e970dd4..1603f5b49e73 100644
@@ -9,7 +9,7 @@ tipc-y	+= addr.o bcast.o bearer.o \
 	   core.o link.o discover.o msg.o  \
 	   name_distr.o  subscr.o monitor.o name_table.o net.o  \
 	   netlink.o netlink_compat.o node.o socket.o eth_media.o \
-	   topsrv.o socket.o group.o trace.o
+	   topsrv.o group.o trace.o
 
 CFLAGS_trace.o += -I$(src)
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 tipc: remove meaningless assignment in Makefile

There is no module named tipc_diag.

The assignment to tipc_diag-y has no effect.

---

 net/tipc/Makefile | 2 --
 1 file changed, 2 deletions(-)
net/tipc/Makefile +0 -2
index 1603f5b49e73..ee49a9f1dd4f 100644
@@ -20,5 +20,3 @@ tipc-$(CONFIG_TIPC_CRYPTO)	+= crypto.o
 
 
 obj-$(CONFIG_TIPC_DIAG)	+= diag.o
-
-tipc_diag-y	:= diag.o
Signature · 1 line
2.17.1
maintainer Applied
#3 lore raw
In reply to Masahiro Yamada

From: Masahiro Yamada <[email protected]>
Date: Mon, 6 Jan 2020 16:35:26 +0900

Quoted 11 lines

net/tipc/Makefile adds socket.o twice.

tipc-y	+= addr.o bcast.o bearer.o \
           core.o link.o discover.o msg.o  \
           name_distr.o  subscr.o monitor.o name_table.o net.o  \
           netlink.o netlink_compat.o node.o socket.o eth_media.o \
                                             ^^^^^^^^
           topsrv.o socket.o group.o trace.o
                    ^^^^^^^^

Applied.