From patchwork Sun May 6 17:05:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?0JrQvtC90YHRgtCw0L3RgtC40L0g0KEuINCS0LjRiNC90LjQstC10YbQutC40Lk=?= X-Patchwork-Id: 909345 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vishnivetsky.ru Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=vishnivetsky.ru header.i=@vishnivetsky.ru header.b="a4/RvvQj"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=vishnivetsky.ru header.i=@vishnivetsky.ru header.b="I0GDdCSf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40fC5Q3w6Kz9s1d for ; Mon, 7 May 2018 03:13:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751795AbeEFRNp (ORCPT ); Sun, 6 May 2018 13:13:45 -0400 Received: from forward105j.mail.yandex.net ([5.45.198.248]:53667 "EHLO forward105j.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751736AbeEFRNo (ORCPT ); Sun, 6 May 2018 13:13:44 -0400 X-Greylist: delayed 463 seconds by postgrey-1.27 at vger.kernel.org; Sun, 06 May 2018 13:13:44 EDT Received: from mxback6g.mail.yandex.net (mxback6g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:167]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 0F2A3181E56 for ; Sun, 6 May 2018 20:06:00 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback6g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 3wXLaFjVil-5xBSv9gF; Sun, 06 May 2018 20:06:00 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vishnivetsky.ru; s=mail; t=1525626360; bh=JWx/stLbk8yOeU/hGKsYSPzBpZuXbJuvUsDple71FYs=; h=Reply-To:To:From:Subject:Message-ID:Date; b=a4/RvvQjnmBBWWJtgzCnDed2nBiOqxj3JrITP3SbiSHD9keedyxRhyU8mVQiGjekO yrzkt4lCRx7ZnP0zJDVsYa61658AM/FXBYO/TJH5OtGrTA83IGtXYX1xMqEjzKReBE PZWBP/u+PhCIdFURDx+nTgxWRlZ1v/RMIxf6PTqo= Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RH8C6vUflg-5xjaIWJR; Sun, 06 May 2018 20:05:59 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vishnivetsky.ru; s=mail; t=1525626359; bh=JWx/stLbk8yOeU/hGKsYSPzBpZuXbJuvUsDple71FYs=; h=Reply-To:To:From:Subject:Message-ID:Date; b=I0GDdCSfDR6x1B26yVTy82GP38mmBVtlJssf0dVBDwS5sqZa6OFnUxRyCjMRjRYKp oGpLIPp68b4K+lNHoSls9cqp8TQ4r1rcRHrYVQo1XzrWaSYFPcwwHC5QyYAzWSf9IK kuPrFjFPSNba4kEsAXT3Xji9aXqcc3MPayqczfAg= Authentication-Results: smtp1j.mail.yandex.net; dkim=pass header.i=@vishnivetsky.ru Reply-To: net-projects@vishnivetsky.ru To: netfilter-devel@vger.kernel.org From: =?utf-8?b?0JrQvtC90YHRgtCw0L3RgtC40L0g0KEuINCS0LjRiNC90LjQstC10YY=?= =?utf-8?b?0LrQuNC5?= Subject: [PATCH] Add kernal module meta-data to nf_conntrack_proto_gre Message-ID: <12b2dbf1-31a6-65bc-419b-02862b3e3f9a@vishnivetsky.ru> Date: Mon, 7 May 2018 00:05:55 +0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Language: ru Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From 10462f9abafc40138362eb499face751ff392a7b Mon Sep 17 00:00:00 2001 From: "Konstantin S. Vishnivetsky" Date: Sun, 8 Apr 2018 18:08:06 +0700 Subject: [PATCH] Add kernal module meta-data to nf_conntrack_proto_gre Some software like firewalld depend on kernel module meta-data. This patch will help to fix: https://github.com/firewalld/firewalld/issues/263 --- net/netfilter/nf_conntrack_proto_gre.c | 6 ++++++ 1 file changed, 6 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c index d049ea5a3770d..282949e8d5b7c 100644 --- a/net/netfilter/nf_conntrack_proto_gre.c +++ b/net/netfilter/nf_conntrack_proto_gre.c @@ -42,6 +42,12 @@ #include #include +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Harald Welte "); +MODULE_DESCRIPTION("Netfilter connection tracking helper module for GRE"); +MODULE_ALIAS("ip_conntrack_gre"); +MODULE_ALIAS_NFCT_HELPER("gre"); + enum grep_conntrack { GRE_CT_UNREPLIED, GRE_CT_REPLIED,