Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932579Ab0LNVbQ (ORCPT ); Tue, 14 Dec 2010 16:31:16 -0500 Received: from smtp-out.google.com ([74.125.121.35]:54541 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932513Ab0LNVbM (ORCPT ); Tue, 14 Dec 2010 16:31:12 -0500 DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=subject:to:from:cc:date:message-id:in-reply-to:references: user-agent:mime-version:content-type: content-transfer-encoding:x-system-of-record; b=phkiE3Yvtiu1YZHNSOyKKeBh0bDsTVlzjPfcL3umKrvgPeZIhXJYaNlCAHcaKhJlx ufToRraxqUQX30cwhgnrw== Subject: [PATCH v3 12/22] netconsole: Move setting of default ports. To: simon.kagstrom@netinsight.net, davem@davemloft.net, nhorman@tuxdriver.com, Matt Mackall From: Mike Waychison Cc: adurbin@google.com, linux-kernel@vger.kernel.org, chavey@google.com, Greg KH , netdev@vger.kernel.org, =?utf-8?q?Am=C3=A9rico?= Wang , akpm@linux-foundation.org, linux-api@vger.kernel.org Date: Tue, 14 Dec 2010 13:29:59 -0800 Message-ID: <20101214212959.17022.85347.stgit@mike.mtv.corp.google.com> In-Reply-To: <20101214212846.17022.64836.stgit@mike.mtv.corp.google.com> References: <20101214212846.17022.64836.stgit@mike.mtv.corp.google.com> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2245 Lines: 61 Clients of netpoll_targets need to be able to specify the default port numbers. Do this by specifying the default port numbers in struct netpoll_targets directly. Signed-off-by: Mike Waychison Acked-by: Matt Mackall --- drivers/net/netconsole.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 5c8701f..fbef723 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -68,6 +68,7 @@ __setup("netconsole=", option_setup); struct netpoll_targets { struct list_head list; spinlock_t lock; + u16 default_local_port, default_remote_port; #ifdef CONFIG_NETCONSOLE_DYNAMIC struct configfs_subsystem configfs_subsys; #endif @@ -161,8 +162,8 @@ static struct netpoll_target *alloc_param_target(struct netpoll_targets *nts, nt->nts = nts; nt->np.name = nts->subsys_name; strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ); - nt->np.local_port = 6665; - nt->np.remote_port = 6666; + nt->np.local_port = nts->default_local_port; + nt->np.remote_port = nts->default_remote_port; memset(nt->np.remote_mac, 0xff, ETH_ALEN); INIT_WORK(&nt->cleanup_work, deferred_netpoll_cleanup); @@ -635,8 +636,8 @@ static struct config_item *make_netpoll_target(struct config_group *group, nt->nts = nts; nt->np.name = nts->subsys_name; strlcpy(nt->np.dev_name, "eth0", IFNAMSIZ); - nt->np.local_port = 6665; - nt->np.remote_port = 6666; + nt->np.local_port = nts->default_local_port; + nt->np.remote_port = nts->default_remote_port; memset(nt->np.remote_mac, 0xff, ETH_ALEN); INIT_WORK(&nt->cleanup_work, deferred_netpoll_cleanup); @@ -926,6 +927,10 @@ static void __exit unregister_netpoll_targets(struct netpoll_targets *nts) static int __init init_netconsole(void) { int err; + + targets.default_local_port = 6665; + targets.default_remote_port = 6666; + err = register_netpoll_targets("netconsole", &targets, config); if (err) return err; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/