diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2022-01-05 13:01:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2022-01-05 13:01:00 +0100 |
| commit | 14d5042fdcd703bd08b3cc829aed4f39d448f398 (patch) | |
| tree | 6607dcd0a8d4e7cc04599f64fbbaf518973de3f0 /net | |
| parent | 7b1717fd47d6113f0cf28e82f7d0dc80e0b05621 (diff) | |
| parent | 0dc4b955f01eae10c6923c86234ef9768137797f (diff) | |
Merge 4.4.298 into android-4.4-p
Changes in 4.4.298
platform/x86: apple-gmux: use resource_size() with res
recordmcount.pl: fix typo in s390 mcount regex
selinux: initialize proto variable in selinux_ip_postroute_compat()
nfc: uapi: use kernel size_t to fix user-space builds
uapi: fix linux/nfc.h userspace compilation errors
xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set.
usb: gadget: f_fs: Clear ffs_eventfd in ffs_data_clear.
scsi: vmw_pvscsi: Set residual data length conditionally
Input: appletouch - initialize work before device registration
Input: spaceball - fix parsing of movement data packets
net: fix use-after-free in tw_timer_handler
Linux 4.4.298
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If5baf377c3d2fb89e244b005a47ddaccaff9e9f9
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/af_inet.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 9a2c36fd3d2f..43f9a0ad479c 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -1789,6 +1789,10 @@ static int __init inet_init(void) tcp_v4_init(); + /* Initialise per-cpu ipv4 mibs */ + if (init_ipv4_mibs()) + panic("%s: Cannot init ipv4 mibs\n", __func__); + /* Setup TCP slab cache for open requests. */ tcp_init(); @@ -1817,12 +1821,6 @@ static int __init inet_init(void) if (init_inet_pernet_ops()) pr_crit("%s: Cannot init ipv4 inet pernet ops\n", __func__); - /* - * Initialise per-cpu ipv4 mibs - */ - - if (init_ipv4_mibs()) - pr_crit("%s: Cannot init ipv4 mibs\n", __func__); ipv4_proc_init(); |