Merge tag 'vfio-v5.11-rc1' of git://github.com/awilliam/linux-vfio

[linux-2.6-microblaze.git] / net / netfilter / nft_set_bitmap.c

diff --git a/net/netfilter/nft_set_bitmap.c b/net/netfilter/nft_set_bitmap.c
index 87e8d9b..2a81ea4 100644 (file)
--- a/net/netfilter/nft_set_bitmap.c
+++ b/net/netfilter/nft_set_bitmap.c
@@ -285,6 +285,8 @@ static bool nft_bitmap_estimate(const struct nft_set_desc *desc, u32 features,
        /* Make sure bitmaps we don't get bitmaps larger than 16 Kbytes. */
        if (desc->klen > 2)
                return false;
+       else if (desc->expr)
+               return false;
 
        est->size   = nft_bitmap_total_size(desc->klen);
        est->lookup = NFT_SET_CLASS_O_1;
@@ -293,8 +295,7 @@ static bool nft_bitmap_estimate(const struct nft_set_desc *desc, u32 features,
        return true;
 }
 
-struct nft_set_type nft_set_bitmap_type __read_mostly = {
-       .owner          = THIS_MODULE,
+const struct nft_set_type nft_set_bitmap_type = {
        .ops            = {
                .privsize       = nft_bitmap_privsize,
                .elemsize       = offsetof(struct nft_bitmap_elem, ext),