From patchwork Tue May 13 08:48:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 348293 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 2AF2F1400D4 for ; Tue, 13 May 2014 18:49:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759707AbaEMIsq (ORCPT ); Tue, 13 May 2014 04:48:46 -0400 Received: from mail-ee0-f51.google.com ([74.125.83.51]:48167 "EHLO mail-ee0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759121AbaEMIsm (ORCPT ); Tue, 13 May 2014 04:48:42 -0400 Received: by mail-ee0-f51.google.com with SMTP id e51so150287eek.38 for ; Tue, 13 May 2014 01:48:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=nTVZzB1d2wNiFlSqDbEEKO+WWQpEqLllUZ8H5E+egyY=; b=SKkLfJyFVmEWjVieXoigqb49rH6wj9t5PlDdTgzdDVTNavCEqU7sz+XVU8I1oWqAqB NRykem4wLKd5OWw3jT2s5LhsqmYdY+PIW228TdLb1MchTgy+aBia0Rec7y/olNyqlg8e D9SQjW7PMjzlOAvcpuWcx+IrTmyeO5jd1T8iKUOCul9rbHdQxByseYobRXjTSehIi6Jn 32pKm/0AxuHjq22g3LMZ3L2zA8DAZ9tmcZ27RbkTI5mYLw2GE3kBueRV1OYahYDE1beD IIZ/n4d2H0dGozdM8nzE4A6TOToOi7P8k49ude6g8+/8vRJcw8GeAK1mYrogbnjAj+QO V2bQ== X-Gm-Message-State: ALoCoQmQJU1pe5mmBZ47DNOSdXjFcquipDwWA58gwWAtSvU09RG3n20rIu+3fA5yTYG1M9H1JoVN X-Received: by 10.14.87.201 with SMTP id y49mr3439717eee.62.1399970921335; Tue, 13 May 2014 01:48:41 -0700 (PDT) Received: from tomegun-x240.getinternet.no (cm-84.208.78.118.getinternet.no. [84.208.78.118]) by mx.google.com with ESMTPSA id o7sm38687198eew.25.2014.05.13.01.48.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 May 2014 01:48:40 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kaber@trash.net, yoshfuji@linux-ipv6.org, jmorris@namei.org, kuznet@ms2.inr.ac.ru, davem@davemloft.net, Tom Gundersen Subject: [PATCH] net: tunnels - enable module autoloading Date: Tue, 13 May 2014 10:48:28 +0200 Message-Id: <1399970908-9973-1-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Enable the module alias hookup to allow tunnel modules to be autoloaded on demand. This is in line with how most other netdev kinds work, and will allow userspace to create tunnels without having CAP_SYS_MODULE. Signed-off-by: Tom Gundersen Tested-by: Susant Sahani --- net/ipv4/ipip.c | 1 + net/ipv6/ip6_tunnel.c | 1 + net/ipv6/sit.c | 1 + 3 files changed, 3 insertions(+) diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 812b183..d8155cf 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -486,4 +486,5 @@ static void __exit ipip_fini(void) module_init(ipip_init); module_exit(ipip_fini); MODULE_LICENSE("GPL"); +MODULE_ALIAS_RTNL_LINK("ipip") MODULE_ALIAS_NETDEV("tunl0"); diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index b05b609..fe61545 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -61,6 +61,7 @@ MODULE_AUTHOR("Ville Nuorvala"); MODULE_DESCRIPTION("IPv6 tunneling device"); MODULE_LICENSE("GPL"); +MODULE_ALIAS_RTNL_LINK("ip6tnl"); MODULE_ALIAS_NETDEV("ip6tnl0"); #ifdef IP6_TNL_DEBUG diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index e5a453c..f438004 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1828,4 +1828,5 @@ xfrm_tunnel_failed: module_init(sit_init); module_exit(sit_cleanup); MODULE_LICENSE("GPL"); +MODULE_ALIAS_RTNL_LINK("sit"); MODULE_ALIAS_NETDEV("sit0");