diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_netlink.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index 23f18f6a5535..53d98974dcf0 100644 --- a/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/net/ipv4/netfilter/ip_conntrack_netlink.c | |||
@@ -1484,21 +1484,28 @@ static struct notifier_block ctnl_notifier_exp = { | |||
1484 | 1484 | ||
1485 | static struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = { | 1485 | static struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = { |
1486 | [IPCTNL_MSG_CT_NEW] = { .call = ctnetlink_new_conntrack, | 1486 | [IPCTNL_MSG_CT_NEW] = { .call = ctnetlink_new_conntrack, |
1487 | .attr_count = CTA_MAX, | ||
1487 | .cap_required = CAP_NET_ADMIN }, | 1488 | .cap_required = CAP_NET_ADMIN }, |
1488 | [IPCTNL_MSG_CT_GET] = { .call = ctnetlink_get_conntrack, | 1489 | [IPCTNL_MSG_CT_GET] = { .call = ctnetlink_get_conntrack, |
1490 | .attr_count = CTA_MAX, | ||
1489 | .cap_required = CAP_NET_ADMIN }, | 1491 | .cap_required = CAP_NET_ADMIN }, |
1490 | [IPCTNL_MSG_CT_DELETE] = { .call = ctnetlink_del_conntrack, | 1492 | [IPCTNL_MSG_CT_DELETE] = { .call = ctnetlink_del_conntrack, |
1493 | .attr_count = CTA_MAX, | ||
1491 | .cap_required = CAP_NET_ADMIN }, | 1494 | .cap_required = CAP_NET_ADMIN }, |
1492 | [IPCTNL_MSG_CT_GET_CTRZERO] = { .call = ctnetlink_get_conntrack, | 1495 | [IPCTNL_MSG_CT_GET_CTRZERO] = { .call = ctnetlink_get_conntrack, |
1496 | .attr_count = CTA_MAX, | ||
1493 | .cap_required = CAP_NET_ADMIN }, | 1497 | .cap_required = CAP_NET_ADMIN }, |
1494 | }; | 1498 | }; |
1495 | 1499 | ||
1496 | static struct nfnl_callback ctnl_exp_cb[IPCTNL_MSG_MAX] = { | 1500 | static struct nfnl_callback ctnl_exp_cb[IPCTNL_MSG_MAX] = { |
1497 | [IPCTNL_MSG_EXP_GET] = { .call = ctnetlink_get_expect, | 1501 | [IPCTNL_MSG_EXP_GET] = { .call = ctnetlink_get_expect, |
1502 | .attr_count = CTA_EXPECT_MAX, | ||
1498 | .cap_required = CAP_NET_ADMIN }, | 1503 | .cap_required = CAP_NET_ADMIN }, |
1499 | [IPCTNL_MSG_EXP_NEW] = { .call = ctnetlink_new_expect, | 1504 | [IPCTNL_MSG_EXP_NEW] = { .call = ctnetlink_new_expect, |
1505 | .attr_count = CTA_EXPECT_MAX, | ||
1500 | .cap_required = CAP_NET_ADMIN }, | 1506 | .cap_required = CAP_NET_ADMIN }, |
1501 | [IPCTNL_MSG_EXP_DELETE] = { .call = ctnetlink_del_expect, | 1507 | [IPCTNL_MSG_EXP_DELETE] = { .call = ctnetlink_del_expect, |
1508 | .attr_count = CTA_EXPECT_MAX, | ||
1502 | .cap_required = CAP_NET_ADMIN }, | 1509 | .cap_required = CAP_NET_ADMIN }, |
1503 | }; | 1510 | }; |
1504 | 1511 | ||
@@ -1506,7 +1513,6 @@ static struct nfnetlink_subsystem ctnl_subsys = { | |||
1506 | .name = "conntrack", | 1513 | .name = "conntrack", |
1507 | .subsys_id = NFNL_SUBSYS_CTNETLINK, | 1514 | .subsys_id = NFNL_SUBSYS_CTNETLINK, |
1508 | .cb_count = IPCTNL_MSG_MAX, | 1515 | .cb_count = IPCTNL_MSG_MAX, |
1509 | .attr_count = CTA_MAX, | ||
1510 | .cb = ctnl_cb, | 1516 | .cb = ctnl_cb, |
1511 | }; | 1517 | }; |
1512 | 1518 | ||
@@ -1514,7 +1520,6 @@ static struct nfnetlink_subsystem ctnl_exp_subsys = { | |||
1514 | .name = "conntrack_expect", | 1520 | .name = "conntrack_expect", |
1515 | .subsys_id = NFNL_SUBSYS_CTNETLINK_EXP, | 1521 | .subsys_id = NFNL_SUBSYS_CTNETLINK_EXP, |
1516 | .cb_count = IPCTNL_MSG_EXP_MAX, | 1522 | .cb_count = IPCTNL_MSG_EXP_MAX, |
1517 | .attr_count = CTA_MAX, | ||
1518 | .cb = ctnl_exp_cb, | 1523 | .cb = ctnl_exp_cb, |
1519 | }; | 1524 | }; |
1520 | 1525 | ||