xt_quota2: minor fixes, merge into main config files

extensions/Kbuild

@@ -16,6 +16,7 @@ obj-${build_condition} += xt_condition.o
 obj-${build_geoip}    += xt_geoip.o
 obj-${build_ipp2p}    += xt_ipp2p.o
 obj-${build_portscan} += xt_portscan.o
+obj-${build_quota2}    += xt_quota2.o
 
 -include ${M}/*.Kbuild
 -include ${M}/Kbuild.*

extensions/Mbuild

@@ -9,3 +9,4 @@ obj-${build_condition} += libxt_condition.so
 obj-${build_geoip}    += libxt_geoip.so
 obj-${build_ipp2p}    += libxt_ipp2p.so
 obj-${build_portscan} += libxt_portscan.so
+obj-${build_quota2}    += libxt_quota2.so

extensions/libxt_quota2.c

@@ -23,7 +23,7 @@ static const struct option quota_mt2_opts[] = {
 	{.name = "grow",    .has_arg = false, .val = 'g'},
 	{.name = "name",    .has_arg = true,  .val = 'n'},
 	{.name = "quota",   .has_arg = true,  .val = 'q'},
-	{.name = "packets", .has_arg = true,  .val = 'p'},
+	{.name = "packets", .has_arg = false, .val = 'p'},
 	{NULL},
 };
 
@@ -60,7 +60,7 @@ quota_mt2_parse(int c, char **argv, int invert, unsigned int *flags,
 		*flags |= FL_NAME;
 		return true;
 	case 'p':
-		param_act(P_ONLY_ONCE, "quota", "--packets", *flags & FL_PACKETS);
+		param_act(P_ONLY_ONCE, "quota", "--packets", *flags & FL_PACKET);
 		param_act(P_NO_INVERT, "quota", "--packets", invert);
 		info->flags |= XT_QUOTA_PACKET;
 		*flags |= FL_PACKET;

extensions/xt_quota2.Kbuild

@@ -1,3 +0,0 @@
-# -*- Makefile -*-
-
-obj-${build_quota2} += xt_quota2.o

extensions/xt_quota2.Mbuild

@@ -1,3 +0,0 @@
-# -*- Makefile -*-
-
-obj-${build_quota2} += libxt_quota2.so

mconfig

@@ -11,3 +11,4 @@ build_condition=m
 build_geoip=m
 build_ipp2p=m
 build_portscan=m
+build_quota2=m

mconfig.quota2

@@ -1,3 +0,0 @@
-# -*- Makefile -*-
-
-build_quota2=m