From patchwork Wed Mar 21 00:01:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin LaHaise X-Patchwork-Id: 147882 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 7181BB6F13 for ; Wed, 21 Mar 2012 11:01:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755511Ab2CUABX (ORCPT ); Tue, 20 Mar 2012 20:01:23 -0400 Received: from kanga.kvack.org ([205.233.56.17]:34273 "EHLO kanga.kvack.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752189Ab2CUABW (ORCPT ); Tue, 20 Mar 2012 20:01:22 -0400 Received: by kanga.kvack.org (Postfix, from userid 63042) id C2DCC6B004A; Tue, 20 Mar 2012 20:01:21 -0400 (EDT) Date: Tue, 20 Mar 2012 20:01:21 -0400 From: Benjamin LaHaise To: "David S. Miller" , James Chapman Cc: netdev@vger.kernel.org Subject: [PATCH] enable automatic module loading for l2tp_ppp Message-ID: <20120321000121.GA3133@kvack.org> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When L2TP is configured as a module, requests for L2TP sockets do not result in the l2tp_ppp module being loaded. Fix this by adding the appropriate MODULE_ALIAS to be recognized by pppox's request_module() call. Signed-off-by: Benjamin LaHaise --- net/l2tp/l2tp_ppp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 9b07191..1addd9f 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1845,3 +1845,4 @@ MODULE_AUTHOR("James Chapman "); MODULE_DESCRIPTION("PPP over L2TP over UDP"); MODULE_LICENSE("GPL"); MODULE_VERSION(PPPOL2TP_DRV_VERSION); +MODULE_ALIAS("pppox-proto-" __stringify(PX_PROTO_OL2TP));