Merge branch 'master' into net-next

man/man8/tipc-bearer.8

@@ -218,7 +218,6 @@ Exit status is 0 if command was successful or a positive integer upon failure.
 .BR tipc-media (8),
 .BR tipc-nametable (8),
 .BR tipc-node (8),
-.BR tipc-peer (8),
 .BR tipc-socket (8)
 .br
 .SH REPORTING BUGS

man/man8/tipc-link.8

@@ -213,7 +213,6 @@ Exit status is 0 if command was successful or a positive integer upon failure.
 .BR tipc-bearer (8),
 .BR tipc-nametable (8),
 .BR tipc-node (8),
-.BR tipc-peer (8),
 .BR tipc-socket (8)
 .br
 .SH REPORTING BUGS

man/man8/tipc-media.8

@@ -74,7 +74,6 @@ Exit status is 0 if command was successful or a positive integer upon failure.
 .BR tipc-link (8),
 .BR tipc-nametable (8),
 .BR tipc-node (8),
-.BR tipc-peer (8),
 .BR tipc-socket (8)
 .br
 .SH REPORTING BUGS

man/man8/tipc-nametable.8

@@ -87,7 +87,6 @@ Exit status is 0 if command was successful or a positive integer upon failure.
 .BR tipc-link (8),
 .BR tipc-media (8),
 .BR tipc-node (8),
-.BR tipc-peer (8),
 .BR tipc-socket (8)
 .br
 .SH REPORTING BUGS

man/man8/tipc-node.8

@@ -59,7 +59,6 @@ Exit status is 0 if command was successful or a positive integer upon failure.
 .BR tipc-link (8),
 .BR tipc-media (8),
 .BR tipc-nametable (8),
-.BR tipc-peer (8),
 .BR tipc-socket (8)
 .br
 .SH REPORTING BUGS

man/man8/tipc-peer.8

-.TH TIPC-PEER 8 "04 Dec 2015" "iproute2" "Linux"
-
-.\" For consistency, please keep padding right aligned.
-.\" For example '.B "foo " bar' and not '.B foo " bar"'
-
-.SH NAME
-tipc-peer \- modify peer information
-
-.SH SYNOPSIS
-.ad l
-.in +8
-
-.ti -8
-.B tipc peer remove address
-.IR ADDRESS
-
-.SH OPTIONS
-Options (flags) that can be passed anywhere in the command chain.
-.TP
-.BR "\-h" , " --help"
-Show help about last valid command. For example
-.B tipc peer --help
-will show peer help and
-.B tipc --help
-will show general help. The position of the option in the string is irrelevant.
-.SH DESCRIPTION
-
-.SS Peer remove
-Remove an offline peer node from the local data structures. The peer is
-identified by its
-.B address
-
-.SH EXIT STATUS
-Exit status is 0 if command was successful or a positive integer upon failure.
-
-.SH SEE ALSO
-.BR tipc (8),
-.BR tipc-bearer (8),
-.BR tipc-link (8),
-.BR tipc-media (8),
-.BR tipc-nametable (8),
-.BR tipc-node (8),
-.BR tipc-socket (8)
-.br
-.SH REPORTING BUGS
-Report any bugs to the Network Developers mailing list
-.B <netdev@vger.kernel.org>
-where the development and maintenance is primarily done.
-You do not have to be subscribed to the list to send a message there.
-
-.SH AUTHOR
-Richard Alpe <richard.alpe@ericsson.com>

man/man8/tipc.8

@@ -87,7 +87,6 @@ Exit status is 0 if command was successful or a positive integer upon failure.
 .BR tipc-media (8),
 .BR tipc-nametable (8),
 .BR tipc-node (8),
-.BR tipc-peer (8),
 .BR tipc-socket (8)
 .br
 .SH REPORTING BUGS

tipc/Makefile

@@ -6,7 +6,7 @@ TIPCOBJ=bearer.o \
     media.o misc.o \
     msg.o nametable.o \
     node.o socket.o \
-    peer.o tipc.o
+    tipc.o
 
 include ../Config
 

tipc/peer.c

-/*
- * peer.c	TIPC peer functionality.
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- * Authors:	Richard Alpe <richard.alpe@ericsson.com>
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#include <linux/tipc_netlink.h>
-#include <linux/tipc.h>
-#include <linux/genetlink.h>
-#include <libmnl/libmnl.h>
-
-#include "cmdl.h"
-#include "msg.h"
-#include "misc.h"
-#include "peer.h"
-
-static int cmd_peer_rm_addr(struct nlmsghdr *nlh, const struct cmd *cmd,
-			    struct cmdl *cmdl, void *data)
-{
-	char *str;
-	uint32_t addr;
-	struct nlattr *nest;
-	char buf[MNL_SOCKET_BUFFER_SIZE];
-
-	if ((cmdl->argc != cmdl->optind + 1) || help_flag) {
-		fprintf(stderr, "Usage: %s peer remove address ADDRESS\n",
-			cmdl->argv[0]);
-		return -EINVAL;
-	}
-
-	str = shift_cmdl(cmdl);
-	addr = str2addr(str);
-	if (!addr)
-		return -1;
-
-	if (!(nlh = msg_init(buf, TIPC_NL_PEER_REMOVE))) {
-		fprintf(stderr, "error, message initialisation failed\n");
-		return -1;
-	}
-
-	nest = mnl_attr_nest_start(nlh, TIPC_NLA_NET);
-	mnl_attr_put_u32(nlh, TIPC_NLA_NET_ADDR, addr);
-	mnl_attr_nest_end(nlh, nest);
-
-	return msg_doit(nlh, NULL, NULL);
-}
-
-static void cmd_peer_rm_help(struct cmdl *cmdl)
-{
-	fprintf(stderr, "Usage: %s peer remove address ADDRESS\n",
-		cmdl->argv[0]);
-}
-
-static int cmd_peer_rm(struct nlmsghdr *nlh, const struct cmd *cmd,
-			struct cmdl *cmdl, void *data)
-{
-	const struct cmd cmds[] = {
-		{ "address",	cmd_peer_rm_addr,	cmd_peer_rm_help },
-		{ NULL }
-	};
-
-	return run_cmd(nlh, cmd, cmds, cmdl, NULL);
-}
-
-void cmd_peer_help(struct cmdl *cmdl)
-{
-	fprintf(stderr,
-		"Usage: %s peer COMMAND [ARGS] ...\n\n"
-		"COMMANDS\n"
-		" remove                - Remove an offline peer node\n",
-		cmdl->argv[0]);
-}
-
-int cmd_peer(struct nlmsghdr *nlh, const struct cmd *cmd, struct cmdl *cmdl,
-	     void *data)
-{
-	const struct cmd cmds[] = {
-		{ "remove",	cmd_peer_rm,	cmd_peer_rm_help },
-		{ NULL }
-	};
-
-	return run_cmd(nlh, cmd, cmds, cmdl, NULL);
-}

tipc/peer.h

-/*
- * peer.h	TIPC peer functionality.
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- * Authors:	Richard Alpe <richard.alpe@ericsson.com>
- */
-
-#ifndef _TIPC_PEER_H
-#define _TIPC_PEER_H
-
-extern int help_flag;
-
-int cmd_peer(struct nlmsghdr *nlh, const struct cmd *cmd, struct cmdl *cmdl,
-	     void *data);
-void cmd_peer_help(struct cmdl *cmdl);
-
-#endif

tipc/tipc.c

@@ -20,7 +20,6 @@
 #include "socket.h"
 #include "media.h"
 #include "node.h"
-#include "peer.h"
 #include "cmdl.h"
 
 int help_flag;
@@ -40,7 +39,6 @@ static void about(struct cmdl *cmdl)
 		" media                 - Show or modify media\n"
 		" nametable             - Show nametable\n"
 		" node                  - Show or modify node related parameters\n"
-		" peer                  - Peer related operations\n"
 		" socket                - Show sockets\n",
 		cmdl->argv[0]);
 }
@@ -61,7 +59,6 @@ int main(int argc, char *argv[])
 		{ "media",	cmd_media,	cmd_media_help},
 		{ "nametable",	cmd_nametable,	cmd_nametable_help},
 		{ "node",	cmd_node,	cmd_node_help},
-		{ "peer",	cmd_peer,	cmd_peer_help},
 		{ "socket",	cmd_socket,	cmd_socket_help},
 		{ NULL }
 	};