From: Greg Kroah-Hartman Date: Thu, 28 Mar 2019 16:16:56 +0000 (+0100) Subject: sign off on some patches X-Git-Tag: v3.18.138~76 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af18a487a54faadfef56cc037bf81c73eaf6f1c5;p=thirdparty%2Fkernel%2Fstable-queue.git sign off on some patches --- diff --git a/queue-4.14/stmmac-copy-unicast-mac-address-to-mac-registers.patch b/queue-4.14/stmmac-copy-unicast-mac-address-to-mac-registers.patch index 0d1bc7b3f7f..ffdd1152434 100644 --- a/queue-4.14/stmmac-copy-unicast-mac-address-to-mac-registers.patch +++ b/queue-4.14/stmmac-copy-unicast-mac-address-to-mac-registers.patch @@ -12,15 +12,14 @@ of updating the MAC register with MAC address. Signed-off-by: Bhadram Varka Signed-off-by: David S. Miller Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - .../net/ethernet/stmicro/stmmac/stmmac_main.c | 16 +++++++++++++++- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index 0cc83e8417ef..4a9dbee6f054 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -3787,6 +3787,20 @@ static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +@@ -3787,6 +3787,20 @@ static int stmmac_ioctl(struct net_devic return ret; } @@ -41,7 +40,7 @@ index 0cc83e8417ef..4a9dbee6f054 100644 #ifdef CONFIG_DEBUG_FS static struct dentry *stmmac_fs_dir; -@@ -4014,7 +4028,7 @@ static const struct net_device_ops stmmac_netdev_ops = { +@@ -4014,7 +4028,7 @@ static const struct net_device_ops stmma #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = stmmac_poll_controller, #endif @@ -50,6 +49,3 @@ index 0cc83e8417ef..4a9dbee6f054 100644 }; /** --- -2.19.1 - diff --git a/queue-4.14/video-fbdev-set-pixclock-0-in-goldfishfb.patch b/queue-4.14/video-fbdev-set-pixclock-0-in-goldfishfb.patch index dc326d03dad..b5cda9e4c13 100644 --- a/queue-4.14/video-fbdev-set-pixclock-0-in-goldfishfb.patch +++ b/queue-4.14/video-fbdev-set-pixclock-0-in-goldfishfb.patch @@ -14,15 +14,14 @@ Signed-off-by: Peter Maydell Signed-off-by: Roman Kiryanov Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/video/fbdev/goldfishfb.c | 2 +- + drivers/video/fbdev/goldfishfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/video/fbdev/goldfishfb.c b/drivers/video/fbdev/goldfishfb.c -index 14a93cb21310..66d58e93bc32 100644 --- a/drivers/video/fbdev/goldfishfb.c +++ b/drivers/video/fbdev/goldfishfb.c -@@ -234,7 +234,7 @@ static int goldfish_fb_probe(struct platform_device *pdev) +@@ -234,7 +234,7 @@ static int goldfish_fb_probe(struct plat fb->fb.var.activate = FB_ACTIVATE_NOW; fb->fb.var.height = readl(fb->reg_base + FB_GET_PHYS_HEIGHT); fb->fb.var.width = readl(fb->reg_base + FB_GET_PHYS_WIDTH); @@ -31,6 +30,3 @@ index 14a93cb21310..66d58e93bc32 100644 fb->fb.var.red.offset = 11; fb->fb.var.red.length = 5; --- -2.19.1 - diff --git a/queue-4.19/ipmi_si-fix-crash-when-using-hard-coded-device.patch b/queue-4.19/ipmi_si-fix-crash-when-using-hard-coded-device.patch index 7bee242c90b..acfaf8b7846 100644 --- a/queue-4.19/ipmi_si-fix-crash-when-using-hard-coded-device.patch +++ b/queue-4.19/ipmi_si-fix-crash-when-using-hard-coded-device.patch @@ -35,18 +35,17 @@ Cc: stable@vger.kernel.org # v4.15+ Signed-off-by: Corey Minyard Tested-by: Yang Yingliang Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/char/ipmi/ipmi_si.h | 4 +- - drivers/char/ipmi/ipmi_si_hardcode.c | 236 ++++++++++++++++++++------- - drivers/char/ipmi/ipmi_si_intf.c | 22 ++- - drivers/char/ipmi/ipmi_si_platform.c | 30 +++- - 4 files changed, 218 insertions(+), 74 deletions(-) + drivers/char/ipmi/ipmi_si.h | 4 + drivers/char/ipmi/ipmi_si_hardcode.c | 232 +++++++++++++++++++++++++---------- + drivers/char/ipmi/ipmi_si_intf.c | 22 ++- + drivers/char/ipmi/ipmi_si_platform.c | 30 +++- + 4 files changed, 216 insertions(+), 72 deletions(-) -diff --git a/drivers/char/ipmi/ipmi_si.h b/drivers/char/ipmi/ipmi_si.h -index 52f6152d1fcb..7ae52c17618e 100644 --- a/drivers/char/ipmi/ipmi_si.h +++ b/drivers/char/ipmi/ipmi_si.h -@@ -25,7 +25,9 @@ void ipmi_irq_finish_setup(struct si_sm_io *io); +@@ -25,7 +25,9 @@ void ipmi_irq_finish_setup(struct si_sm_ int ipmi_si_remove_by_dev(struct device *dev); void ipmi_si_remove_by_data(int addr_space, enum si_type si_type, unsigned long addr); @@ -57,8 +56,6 @@ index 52f6152d1fcb..7ae52c17618e 100644 void ipmi_si_platform_init(void); void ipmi_si_platform_shutdown(void); -diff --git a/drivers/char/ipmi/ipmi_si_hardcode.c b/drivers/char/ipmi/ipmi_si_hardcode.c -index 10219f24546b..9ae2405c28bb 100644 --- a/drivers/char/ipmi/ipmi_si_hardcode.c +++ b/drivers/char/ipmi/ipmi_si_hardcode.c @@ -1,6 +1,7 @@ @@ -104,7 +101,7 @@ index 10219f24546b..9ae2405c28bb 100644 module_param_string(type, si_type_str, MAX_SI_TYPE_STR, 0); MODULE_PARM_DESC(type, "Defines the type of each interface, each" -@@ -72,12 +72,133 @@ MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for" +@@ -72,12 +72,133 @@ MODULE_PARM_DESC(slave_addrs, "Set the d " overridden by this parm. This is an array indexed" " by interface number."); @@ -115,10 +112,7 @@ index 10219f24546b..9ae2405c28bb 100644 + unsigned int i, + unsigned long addr, + unsigned int flags) - { -- int ret = -ENODEV; -- int i; -- struct si_sm_io io; ++{ + struct platform_device *pdev; + unsigned int num_r = 1, size; + struct resource r[4]; @@ -235,7 +229,10 @@ index 10219f24546b..9ae2405c28bb 100644 +} + +void __init ipmi_hardcode_init(void) -+{ + { +- int ret = -ENODEV; +- int i; +- struct si_sm_io io; + unsigned int i; char *str; + char *si_type[SI_MAX_PARMS]; @@ -253,7 +250,15 @@ index 10219f24546b..9ae2405c28bb 100644 - - io.addr_source = SI_HARDCODED; - pr_info(PFX "probing via hardcoded address\n"); -- ++ if (i < num_ports && ports[i]) ++ ipmi_hardcode_init_one(si_type[i], i, ports[i], ++ IORESOURCE_IO); ++ if (i < num_addrs && addrs[i]) ++ ipmi_hardcode_init_one(si_type[i], i, addrs[i], ++ IORESOURCE_MEM); ++ } ++} + - if (!si_type[i] || strcmp(si_type[i], "kcs") == 0) { - io.si_type = SI_KCS; - } else if (strcmp(si_type[i], "smic") == 0) { @@ -265,14 +270,9 @@ index 10219f24546b..9ae2405c28bb 100644 - i, si_type[i]); - continue; - } -+ if (i < num_ports && ports[i]) -+ ipmi_hardcode_init_one(si_type[i], i, ports[i], -+ IORESOURCE_IO); -+ if (i < num_addrs && addrs[i]) -+ ipmi_hardcode_init_one(si_type[i], i, addrs[i], -+ IORESOURCE_MEM); -+ } -+} ++void ipmi_si_hardcode_exit(void) ++{ ++ unsigned int i; - if (ports[i]) { - /* An I/O port */ @@ -287,9 +287,11 @@ index 10219f24546b..9ae2405c28bb 100644 - i); - continue; - } -+void ipmi_si_hardcode_exit(void) -+{ -+ unsigned int i; ++ for (i = 0; i < SI_MAX_PARMS; i++) { ++ if (ipmi_hc_pdevs[i]) ++ platform_device_unregister(ipmi_hc_pdevs[i]); ++ } ++} - io.addr = NULL; - io.regspacing = regspacings[i]; @@ -303,15 +305,6 @@ index 10219f24546b..9ae2405c28bb 100644 - if (io.irq) - io.irq_setup = ipmi_std_irq_setup; - io.slave_addr = slave_addrs[i]; -- -- ret = ipmi_si_add_smi(&io); -+ for (i = 0; i < SI_MAX_PARMS; i++) { -+ if (ipmi_hc_pdevs[i]) -+ platform_device_unregister(ipmi_hc_pdevs[i]); - } -- return ret; -+} -+ +/* + * Returns true of the given address exists as a hardcoded address, + * false if not. @@ -319,7 +312,8 @@ index 10219f24546b..9ae2405c28bb 100644 +int ipmi_si_hardcode_match(int addr_type, unsigned long addr) +{ + unsigned int i; -+ + +- ret = ipmi_si_add_smi(&io); + if (addr_type == IPMI_IO_ADDR_SPACE) { + for (i = 0; i < num_ports; i++) { + if (ports[i] == addr) @@ -330,12 +324,11 @@ index 10219f24546b..9ae2405c28bb 100644 + if (addrs[i] == addr) + return 1; + } -+ } + } +- return ret; + + return 0; } -diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c -index 82d831b103f9..75e5006f395a 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -1862,6 +1862,18 @@ int ipmi_si_add_smi(struct si_sm_io *io) @@ -357,7 +350,7 @@ index 82d831b103f9..75e5006f395a 100644 if (!io->io_setup) { if (io->addr_type == IPMI_IO_ADDR_SPACE) { io->io_setup = ipmi_si_port_setup; -@@ -2094,7 +2106,7 @@ static int try_smi_init(struct smi_info *new_smi) +@@ -2094,7 +2106,7 @@ static int try_smi_init(struct smi_info return rv; } @@ -397,11 +390,9 @@ index 82d831b103f9..75e5006f395a 100644 } module_exit(cleanup_ipmi_si); -diff --git a/drivers/char/ipmi/ipmi_si_platform.c b/drivers/char/ipmi/ipmi_si_platform.c -index bf69927502bd..d32b0dd377c5 100644 --- a/drivers/char/ipmi/ipmi_si_platform.c +++ b/drivers/char/ipmi/ipmi_si_platform.c -@@ -126,8 +126,6 @@ ipmi_get_info_from_resources(struct platform_device *pdev, +@@ -126,8 +126,6 @@ ipmi_get_info_from_resources(struct plat if (res_second->start > io->addr_data) io->regspacing = res_second->start - io->addr_data; } @@ -410,7 +401,7 @@ index bf69927502bd..d32b0dd377c5 100644 return res; } -@@ -135,7 +133,7 @@ ipmi_get_info_from_resources(struct platform_device *pdev, +@@ -135,7 +133,7 @@ ipmi_get_info_from_resources(struct plat static int platform_ipmi_probe(struct platform_device *pdev) { struct si_sm_io io; @@ -419,7 +410,7 @@ index bf69927502bd..d32b0dd377c5 100644 int rv; rv = device_property_read_u8(&pdev->dev, "addr-source", &addr_source); -@@ -147,7 +145,7 @@ static int platform_ipmi_probe(struct platform_device *pdev) +@@ -147,7 +145,7 @@ static int platform_ipmi_probe(struct pl if (addr_source == SI_SMBIOS) { if (!si_trydmi) return -ENODEV; @@ -428,7 +419,7 @@ index bf69927502bd..d32b0dd377c5 100644 if (!si_tryplatform) return -ENODEV; } -@@ -167,11 +165,23 @@ static int platform_ipmi_probe(struct platform_device *pdev) +@@ -167,11 +165,23 @@ static int platform_ipmi_probe(struct pl case SI_BT: io.si_type = type; break; @@ -452,7 +443,7 @@ index bf69927502bd..d32b0dd377c5 100644 if (!ipmi_get_info_from_resources(pdev, &io)) return -EINVAL; -@@ -191,7 +201,8 @@ static int platform_ipmi_probe(struct platform_device *pdev) +@@ -191,7 +201,8 @@ static int platform_ipmi_probe(struct pl io.dev = &pdev->dev; @@ -462,7 +453,7 @@ index bf69927502bd..d32b0dd377c5 100644 (io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem", io.addr_data, io.regsize, io.regspacing, io.irq); -@@ -356,6 +367,9 @@ static int acpi_ipmi_probe(struct platform_device *pdev) +@@ -356,6 +367,9 @@ static int acpi_ipmi_probe(struct platfo goto err_free; } @@ -472,7 +463,7 @@ index bf69927502bd..d32b0dd377c5 100644 res = ipmi_get_info_from_resources(pdev, &io); if (!res) { rv = -EINVAL; -@@ -417,6 +431,11 @@ static int ipmi_remove(struct platform_device *pdev) +@@ -417,6 +431,11 @@ static int ipmi_remove(struct platform_d return ipmi_si_remove_by_dev(&pdev->dev); } @@ -484,7 +475,7 @@ index bf69927502bd..d32b0dd377c5 100644 struct platform_driver ipmi_platform_driver = { .driver = { .name = DEVICE_NAME, -@@ -425,6 +444,7 @@ struct platform_driver ipmi_platform_driver = { +@@ -425,6 +444,7 @@ struct platform_driver ipmi_platform_dri }, .probe = ipmi_probe, .remove = ipmi_remove, @@ -492,6 +483,3 @@ index bf69927502bd..d32b0dd377c5 100644 }; void ipmi_si_platform_init(void) --- -2.19.1 - diff --git a/queue-4.9/cfg80211-size-various-nl80211-messages-correctly.patch b/queue-4.9/cfg80211-size-various-nl80211-messages-correctly.patch index 8bda2dbe529..5a404f1c42b 100644 --- a/queue-4.9/cfg80211-size-various-nl80211-messages-correctly.patch +++ b/queue-4.9/cfg80211-size-various-nl80211-messages-correctly.patch @@ -24,15 +24,14 @@ constant for the remaining message overhead (it's usually around Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - net/wireless/nl80211.c | 16 ++++++++-------- + net/wireless/nl80211.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c -index 549d0a4083b3..09a353c6373a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -12942,7 +12942,7 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev, +@@ -12942,7 +12942,7 @@ static void nl80211_send_mlme_event(stru struct sk_buff *msg; void *hdr; @@ -41,7 +40,7 @@ index 549d0a4083b3..09a353c6373a 100644 if (!msg) return; -@@ -13094,7 +13094,7 @@ void nl80211_send_connect_result(struct cfg80211_registered_device *rdev, +@@ -13094,7 +13094,7 @@ void nl80211_send_connect_result(struct struct sk_buff *msg; void *hdr; @@ -50,7 +49,7 @@ index 549d0a4083b3..09a353c6373a 100644 if (!msg) return; -@@ -13136,7 +13136,7 @@ void nl80211_send_roamed(struct cfg80211_registered_device *rdev, +@@ -13136,7 +13136,7 @@ void nl80211_send_roamed(struct cfg80211 struct sk_buff *msg; void *hdr; @@ -59,7 +58,7 @@ index 549d0a4083b3..09a353c6373a 100644 if (!msg) return; -@@ -13173,7 +13173,7 @@ void nl80211_send_disconnected(struct cfg80211_registered_device *rdev, +@@ -13173,7 +13173,7 @@ void nl80211_send_disconnected(struct cf struct sk_buff *msg; void *hdr; @@ -68,7 +67,7 @@ index 549d0a4083b3..09a353c6373a 100644 if (!msg) return; -@@ -13249,7 +13249,7 @@ void cfg80211_notify_new_peer_candidate(struct net_device *dev, const u8 *addr, +@@ -13249,7 +13249,7 @@ void cfg80211_notify_new_peer_candidate( trace_cfg80211_notify_new_peer_candidate(dev, addr); @@ -77,7 +76,7 @@ index 549d0a4083b3..09a353c6373a 100644 if (!msg) return; -@@ -13620,7 +13620,7 @@ int nl80211_send_mgmt(struct cfg80211_registered_device *rdev, +@@ -13620,7 +13620,7 @@ int nl80211_send_mgmt(struct cfg80211_re struct sk_buff *msg; void *hdr; @@ -86,7 +85,7 @@ index 549d0a4083b3..09a353c6373a 100644 if (!msg) return -ENOMEM; -@@ -13664,7 +13664,7 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie, +@@ -13664,7 +13664,7 @@ void cfg80211_mgmt_tx_status(struct wire trace_cfg80211_mgmt_tx_status(wdev, cookie, ack); @@ -95,7 +94,7 @@ index 549d0a4083b3..09a353c6373a 100644 if (!msg) return; -@@ -14473,7 +14473,7 @@ void cfg80211_ft_event(struct net_device *netdev, +@@ -14473,7 +14473,7 @@ void cfg80211_ft_event(struct net_device if (!ft_event->target_ap) return; @@ -104,6 +103,3 @@ index 549d0a4083b3..09a353c6373a 100644 if (!msg) return; --- -2.19.1 - diff --git a/queue-4.9/stmmac-copy-unicast-mac-address-to-mac-registers.patch b/queue-4.9/stmmac-copy-unicast-mac-address-to-mac-registers.patch index 5984a601aad..8567faee6a0 100644 --- a/queue-4.9/stmmac-copy-unicast-mac-address-to-mac-registers.patch +++ b/queue-4.9/stmmac-copy-unicast-mac-address-to-mac-registers.patch @@ -12,15 +12,14 @@ of updating the MAC register with MAC address. Signed-off-by: Bhadram Varka Signed-off-by: David S. Miller Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - .../net/ethernet/stmicro/stmmac/stmmac_main.c | 16 +++++++++++++++- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index 20a2b01b392c..fc437d75ac76 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -2931,6 +2931,20 @@ static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +@@ -2931,6 +2931,20 @@ static int stmmac_ioctl(struct net_devic return ret; } @@ -41,7 +40,7 @@ index 20a2b01b392c..fc437d75ac76 100644 #ifdef CONFIG_DEBUG_FS static struct dentry *stmmac_fs_dir; -@@ -3137,7 +3151,7 @@ static const struct net_device_ops stmmac_netdev_ops = { +@@ -3137,7 +3151,7 @@ static const struct net_device_ops stmma #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = stmmac_poll_controller, #endif @@ -50,6 +49,3 @@ index 20a2b01b392c..fc437d75ac76 100644 }; /** --- -2.19.1 - diff --git a/queue-4.9/video-fbdev-set-pixclock-0-in-goldfishfb.patch b/queue-4.9/video-fbdev-set-pixclock-0-in-goldfishfb.patch index b6ad5e51c2d..14a54500ed4 100644 --- a/queue-4.9/video-fbdev-set-pixclock-0-in-goldfishfb.patch +++ b/queue-4.9/video-fbdev-set-pixclock-0-in-goldfishfb.patch @@ -14,15 +14,14 @@ Signed-off-by: Peter Maydell Signed-off-by: Roman Kiryanov Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - drivers/video/fbdev/goldfishfb.c | 2 +- + drivers/video/fbdev/goldfishfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/video/fbdev/goldfishfb.c b/drivers/video/fbdev/goldfishfb.c -index 14a93cb21310..66d58e93bc32 100644 --- a/drivers/video/fbdev/goldfishfb.c +++ b/drivers/video/fbdev/goldfishfb.c -@@ -234,7 +234,7 @@ static int goldfish_fb_probe(struct platform_device *pdev) +@@ -234,7 +234,7 @@ static int goldfish_fb_probe(struct plat fb->fb.var.activate = FB_ACTIVATE_NOW; fb->fb.var.height = readl(fb->reg_base + FB_GET_PHYS_HEIGHT); fb->fb.var.width = readl(fb->reg_base + FB_GET_PHYS_WIDTH); @@ -31,6 +30,3 @@ index 14a93cb21310..66d58e93bc32 100644 fb->fb.var.red.offset = 11; fb->fb.var.red.length = 5; --- -2.19.1 - diff --git a/queue-5.0/netfilter-nf_tables-fix-set-double-free-in-abort-pat.patch b/queue-5.0/netfilter-nf_tables-fix-set-double-free-in-abort-pat.patch index 285abf75fd6..ce5c11b1515 100644 --- a/queue-5.0/netfilter-nf_tables-fix-set-double-free-in-abort-pat.patch +++ b/queue-5.0/netfilter-nf_tables-fix-set-double-free-in-abort-pat.patch @@ -44,13 +44,12 @@ Bugzilla: https://bugzilla.netfilter.org/show_bug.cgi?id=1325 Acked-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - include/net/netfilter/nf_tables.h | 6 ++---- - net/netfilter/nf_tables_api.c | 17 +++++++++++------ + include/net/netfilter/nf_tables.h | 6 ++---- + net/netfilter/nf_tables_api.c | 17 +++++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) -diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h -index b4984bbbe157..3d58acf94dd2 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -416,7 +416,8 @@ struct nft_set { @@ -79,11 +78,9 @@ index b4984bbbe157..3d58acf94dd2 100644 struct nft_trans_chain { bool update; -diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c -index 4893f248dfdc..e1724f9d8b9d 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -127,7 +127,7 @@ static void nft_set_trans_bind(const struct nft_ctx *ctx, struct nft_set *set) +@@ -127,7 +127,7 @@ static void nft_set_trans_bind(const str list_for_each_entry_reverse(trans, &net->nft.commit_list, list) { if (trans->msg_type == NFT_MSG_NEWSET && nft_trans_set(trans) == set) { @@ -92,7 +89,7 @@ index 4893f248dfdc..e1724f9d8b9d 100644 break; } } -@@ -6617,8 +6617,7 @@ static void nf_tables_abort_release(struct nft_trans *trans) +@@ -6617,8 +6617,7 @@ static void nf_tables_abort_release(stru nf_tables_rule_destroy(&trans->ctx, nft_trans_rule(trans)); break; case NFT_MSG_NEWSET: @@ -102,7 +99,7 @@ index 4893f248dfdc..e1724f9d8b9d 100644 break; case NFT_MSG_NEWSETELEM: nft_set_elem_destroy(nft_trans_elem_set(trans), -@@ -6691,8 +6690,11 @@ static int __nf_tables_abort(struct net *net) +@@ -6691,8 +6690,11 @@ static int __nf_tables_abort(struct net break; case NFT_MSG_NEWSET: trans->ctx.table->use--; @@ -116,7 +113,7 @@ index 4893f248dfdc..e1724f9d8b9d 100644 break; case NFT_MSG_DELSET: trans->ctx.table->use++; -@@ -6700,8 +6702,11 @@ static int __nf_tables_abort(struct net *net) +@@ -6700,8 +6702,11 @@ static int __nf_tables_abort(struct net nft_trans_destroy(trans); break; case NFT_MSG_NEWSETELEM: @@ -129,6 +126,3 @@ index 4893f248dfdc..e1724f9d8b9d 100644 te->set->ops->remove(net, te->set, &te->elem); atomic_dec(&te->set->nelems); break; --- -2.19.1 -