| Message ID | 1382089317-24311-1-git-send-email-kadlec@blackhole.kfki.hu |
|---|---|
| State | Not Applicable |
| Headers | show
Return-Path: <netfilter-devel-owner@vger.kernel.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7168D2C00D1 for <incoming@patchwork.ozlabs.org>; Fri, 18 Oct 2013 20:42:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752761Ab3JRJmA (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Fri, 18 Oct 2013 05:42:00 -0400 Received: from smtp-in.kfki.hu ([148.6.0.28]:33613 "EHLO smtp2.kfki.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752675Ab3JRJmA (ORCPT <rfc822; netfilter-devel@vger.kernel.org>); Fri, 18 Oct 2013 05:42:00 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp2.kfki.hu (Postfix) with ESMTP id B6A3F1F4100; Fri, 18 Oct 2013 11:41:57 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at smtp2.kfki.hu Received: from smtp2.kfki.hu ([127.0.0.1]) by localhost (smtp2.kfki.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HSsImBDQaC5A; Fri, 18 Oct 2013 11:41:57 +0200 (CEST) Received: from blackhole.kfki.hu (blackhole.kfki.hu [148.6.0.114]) by smtp2.kfki.hu (Postfix) with ESMTP id 68F6E1F40E9; Fri, 18 Oct 2013 11:41:57 +0200 (CEST) Received: by blackhole.kfki.hu (Postfix, from userid 1000) id 4813E20928; Fri, 18 Oct 2013 11:41:57 +0200 (CEST) From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> To: netfilter-devel@vger.kernel.org Cc: Pablo Neira Ayuso <pablo@netfilter.org> Subject: [PATCH 0/3] ipset patches for nf-next Date: Fri, 18 Oct 2013 11:41:54 +0200 Message-Id: <1382089317-24311-1-git-send-email-kadlec@blackhole.kfki.hu> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: <netfilter-devel.vger.kernel.org> X-Mailing-List: netfilter-devel@vger.kernel.org |
Hi Pablo, Here follows three small patches for nf-next: - Instead of cb->data, use callback dump args only and introduce symbolic names to access the arg members. - We have to use dev_net() instead of the direct access to ->nd_net, otherwise compilation fails if NET_NS is not enabled. Reported by the kbuild test robot. - Unnamed unions should be possible to be initialized directly, but unfortunately it's not so and can lead to compile time error. Reported by Husnu Demir. All patches are from me. Best regards, Jozsef The following changes since commit d86946d2c5b4e519ffe435c2deeb2c9436ceb04f: netfilter: ipt_CLUSTERIP: use proper net namespace to operate CLUSTERIP (2013-10-17 10:48:47 +0200) are available in the git repository at: git://blackhole.kfki.hu/nf-next master for you to fetch changes up to e190952746fb81143945d2397f74aa7ae773bc82: netfilter: ipset: The unnamed union initialization may lead to compilation error (2013-10-18 11:38:53 +0200) ---------------------------------------------------------------- Jozsef Kadlecsik (3): netfilter: ipset: Use netlink callback dump args only net: sched: Use dev_net() instead of the direct access to ->nd_net netfilter: ipset: The unnamed union initialization may lead to compilation error include/linux/netfilter/ipset/ip_set.h | 10 ++++ net/netfilter/ipset/ip_set_bitmap_gen.h | 11 ++-- net/netfilter/ipset/ip_set_core.c | 70 +++++++++++++------------- net/netfilter/ipset/ip_set_hash_gen.h | 20 ++++---- net/netfilter/ipset/ip_set_hash_netnet.c | 22 ++++---- net/netfilter/ipset/ip_set_hash_netportnet.c | 22 ++++---- net/netfilter/ipset/ip_set_list_set.c | 11 ++-- net/sched/em_ipset.c | 4 +- 8 files changed, 90 insertions(+), 80 deletions(-) -- 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