From patchwork Wed Oct 1 10:13:00 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 2223 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 452D0DDED9 for ; Wed, 1 Oct 2008 20:14:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752848AbYJAKNw (ORCPT ); Wed, 1 Oct 2008 06:13:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752707AbYJAKNv (ORCPT ); Wed, 1 Oct 2008 06:13:51 -0400 Received: from smtp.nokia.com ([192.100.122.230]:38287 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753775AbYJAKNr (ORCPT ); Wed, 1 Oct 2008 06:13:47 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx03.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id m91ADEx5022067 for ; Wed, 1 Oct 2008 13:13:44 +0300 Received: from vaebh102.NOE.Nokia.com ([10.160.244.23]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 1 Oct 2008 13:13:25 +0300 Received: from vaebh101.NOE.Nokia.com ([10.160.244.22]) by vaebh102.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 1 Oct 2008 13:13:06 +0300 Received: from localhost.localdomain ([172.21.41.96]) by vaebh101.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 1 Oct 2008 13:13:05 +0300 From: Remi Denis-Courmont To: netdev@vger.kernel.org Subject: [PATCH 1/6] Phonet: transport protocol auto-loading Date: Wed, 1 Oct 2008 13:13:00 +0300 Message-Id: <1222855985-22859-1-git-send-email-remi.denis-courmont@nokia.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <200810011312.17288.remi.denis-courmont@nokia.com> References: <200810011312.17288.remi.denis-courmont@nokia.com> MIME-Version: 1.0 X-OriginalArrivalTime: 01 Oct 2008 10:13:05.0867 (UTC) FILETIME=[4BBC19B0:01C923AE] X-Nokia-AV: Clean Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Rémi Denis-Courmont --- net/phonet/af_phonet.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c index 1d8df6b..06627d3 100644 --- a/net/phonet/af_phonet.c +++ b/net/phonet/af_phonet.c @@ -64,6 +64,11 @@ static int pn_socket_create(struct net *net, struct socket *sock, int protocol) } pnp = phonet_proto_get(protocol); +#ifdef CONFIG_KMOD + if (pnp == NULL + && request_module("net-pf-%d-proto-%d", PF_PHONET, protocol) == 0) + pnp = phonet_proto_get(protocol); +#endif if (pnp == NULL) return -EPROTONOSUPPORT; if (sock->type != pnp->sock_type) {