From patchwork Thu May 15 21:21:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 349362 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 249E3140096 for ; Fri, 16 May 2014 07:22:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756064AbaEOVVn (ORCPT ); Thu, 15 May 2014 17:21:43 -0400 Received: from mail-ee0-f53.google.com ([74.125.83.53]:50885 "EHLO mail-ee0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756025AbaEOVVl (ORCPT ); Thu, 15 May 2014 17:21:41 -0400 Received: by mail-ee0-f53.google.com with SMTP id c13so1016407eek.12 for ; Thu, 15 May 2014 14:21:40 -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:in-reply-to :references; bh=T4CM3LB6mNw7AqyaWyj6A9Gm2qwEjJrNeCPxDapx6og=; b=CPtXjsl+1SPtf/50gJSeePM8mok9E9XC5BVgKr3RFV945AF2iuU951PSjw6CWG0+j3 GRz/jYk2+4mRePlHMg+As8mgGDpL0vl0mEwftugbd/o/Jtt8L7scNum8d3uI7+lzJlJU hqy4pc/uB1pEDR8X/CMHiZ6DIdxwzhnNnxSQQDn1QUx7D4h3RZJpSPYrql7lgM91z6oY rKAVnYKlQT/o0zyNFGHWv5+14eNwOauYP9S20GZWSLJJizQS03RZrnleLuZ+2lfwYlTH EM9+jF/yS/yF4l8xJTMkiurtvtVD+Q21+OOyF9WnToy6Dti8TuRsRv4DczEJYhRhQeFB zQ+A== X-Gm-Message-State: ALoCoQm/1zdXYyHGCzoXDr02pgLgaGFWB96PyGAEqOQ79mNLI5PuIgD8rA/GUw4xtwoe0QoofD+K X-Received: by 10.14.225.65 with SMTP id y41mr6149038eep.75.1400188900069; Thu, 15 May 2014 14:21:40 -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 w9sm15267628eev.4.2014.05.15.14.21.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 May 2014 14:21:38 -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 v2] net: tunnels - enable module autoloading Date: Thu, 15 May 2014 23:21:30 +0200 Message-Id: <1400188890-2038-1-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.0 In-Reply-To: <20140515.153721.2222505094570361361.davem@davemloft.net> References: <20140515.153721.2222505094570361361.davem@davemloft.net> 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 --- v2: add ';' Hi Dave, I must have sent out the wrong version of this patch. Sorry for the inconvenience! Cheers, Tom 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..4bc508f 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");