Merge "rmnet_offload: If1758f15b5518fc144bc0fc425b1ab452a44f6be"

2 files changed, 14 insertions, 39 deletions

diff --git a/offload/rmnet_offload_main.c b/offload/rmnet_offload_main.c
index 3a5634c..7a2c72e 100644
--- a/offload/rmnet_offload_main.c
+++ b/offload/rmnet_offload_main.c
@@ -22,39 +22,12 @@
 #include "rmnet_offload_state.h"
 #include "rmnet_offload_engine.h"
 #include "rmnet_offload_stats.h"
-static char*verinfo[]={"\x37\x34\x31\x35\x39\x32\x31\x63",
-"\x34\x31\x32\x39\x36\x62\x30\x39"};module_param_array(verinfo,charp,NULL,
-(0xcb7+5769-0x221c));MODULE_PARM_DESC(verinfo,
+static char*verinfo[]={"\x32\x61\x34\x34\x66\x36\x62\x65",
+"\x37\x34\x31\x35\x39\x32\x31\x63","\x34\x31\x32\x39\x36\x62\x30\x39"};
+module_param_array(verinfo,charp,NULL,(0xcb7+5769-0x221c));MODULE_PARM_DESC(
+verinfo,
 "\x56\x65\x72\x73\x69\x6f\x6e\x20\x6f\x66\x20\x74\x68\x65\x20\x64\x72\x69\x76\x65\x72"
-);static const char*DATARMNET9be3ddbe97[]__always_unused={
-"\x49\x37\x32\x31\x62\x64\x36\x39\x35\x32\x31\x66\x65\x34\x61\x61\x38\x64\x61\x65\x62\x65\x66\x62\x32\x38\x30\x64\x38\x64\x31\x35\x30\x39\x66\x39\x31\x65\x36\x37\x33"
-,
-"\x49\x36\x64\x36\x66\x39\x32\x35\x66\x33\x65\x33\x32\x31\x65\x31\x32\x32\x38\x64\x33\x38\x37\x33\x66\x63\x37\x38\x32\x31\x38\x62\x61\x39\x30\x65\x39\x34\x35\x30\x36"
-,
-"\x49\x36\x61\x62\x39\x37\x30\x65\x36\x62\x65\x65\x34\x33\x39\x34\x63\x36\x31\x30\x33\x38\x31\x62\x62\x38\x39\x66\x36\x33\x36\x31\x61\x34\x66\x30\x33\x36\x63\x66\x30"
-,
-"\x49\x38\x63\x31\x65\x62\x39\x62\x63\x35\x37\x36\x33\x33\x66\x34\x33\x63\x30\x38\x64\x32\x66\x62\x35\x35\x37\x32\x37\x34\x65\x61\x33\x31\x36\x65\x35\x66\x61\x30\x63"
-,
-"\x49\x30\x64\x64\x66\x33\x66\x66\x30\x34\x36\x66\x31\x62\x39\x33\x66\x63\x31\x39\x62\x62\x38\x35\x62\x31\x38\x64\x30\x34\x30\x63\x33\x34\x33\x62\x39\x39\x66\x37\x33"
-,
-"\x49\x33\x62\x36\x31\x30\x37\x35\x34\x33\x32\x32\x61\x66\x30\x39\x30\x66\x65\x39\x61\x65\x31\x34\x61\x61\x31\x38\x61\x35\x33\x34\x30\x66\x62\x61\x38\x36\x36\x64\x62"
-,
-"\x49\x35\x31\x34\x36\x62\x33\x61\x30\x31\x36\x65\x66\x36\x35\x62\x33\x65\x36\x34\x35\x31\x33\x38\x64\x31\x34\x38\x31\x66\x37\x35\x35\x63\x66\x31\x31\x33\x34\x61\x32"
-,
-"\x49\x63\x62\x64\x62\x30\x34\x62\x62\x62\x38\x31\x61\x32\x36\x62\x61\x32\x62\x37\x31\x64\x37\x64\x39\x34\x35\x66\x62\x30\x39\x34\x61\x65\x39\x63\x37\x63\x64\x35\x30"
-,
-"\x49\x39\x35\x33\x30\x37\x35\x62\x30\x62\x36\x66\x65\x62\x34\x39\x33\x61\x35\x32\x61\x33\x36\x64\x33\x33\x32\x65\x63\x65\x35\x62\x64\x66\x35\x37\x31\x65\x34\x65\x36"
-,
-"\x49\x65\x32\x33\x63\x62\x66\x36\x31\x35\x35\x39\x34\x32\x35\x30\x66\x34\x31\x31\x61\x34\x66\x32\x37\x37\x66\x30\x64\x32\x35\x30\x65\x61\x61\x36\x66\x65\x64\x37\x65"
-,
-"\x49\x38\x32\x35\x34\x30\x39\x61\x64\x37\x64\x39\x32\x31\x66\x66\x64\x65\x38\x37\x65\x61\x34\x32\x31\x62\x30\x66\x31\x37\x36\x37\x33\x65\x63\x38\x64\x63\x30\x39\x36"
-,
-"\x49\x64\x65\x34\x37\x33\x66\x64\x34\x36\x36\x31\x36\x38\x35\x39\x61\x36\x33\x33\x66\x61\x38\x63\x61\x61\x34\x61\x62\x39\x65\x39\x32\x64\x64\x31\x39\x36\x63\x64\x32"
-,
-"\x49\x66\x66\x33\x66\x32\x39\x35\x39\x62\x65\x63\x62\x61\x31\x35\x66\x66\x38\x35\x31\x65\x38\x61\x30\x66\x30\x32\x30\x64\x39\x33\x33\x61\x65\x34\x64\x65\x66\x31\x39"
-,
-"\x49\x33\x38\x33\x35\x64\x61\x37\x38\x66\x30\x33\x30\x63\x31\x37\x35\x62\x62\x36\x63\x65\x31\x35\x63\x62\x63\x62\x37\x33\x63\x35\x30\x32\x37\x32\x64\x64\x37\x66\x32"
-,};static DEFINE_SPINLOCK(DATARMNET0b5e447f18);static u32 DATARMNETcb7325e02d(
+);static DEFINE_SPINLOCK(DATARMNET0b5e447f18);static u32 DATARMNETcb7325e02d(
 struct DATARMNETd812bcdbb5*DATARMNET458b70e7e5){struct DATARMNET4287f07234*
 DATARMNET8814564ab9=&DATARMNET458b70e7e5->DATARMNET144d119066;__be32 
 DATARMNETdfd47b00ff[(0xd20+231-0xdfc)];u32 DATARMNET5ebf661879;__be16 
diff --git a/offload/rmnet_offload_state.c b/offload/rmnet_offload_state.c
index 65a1081..f1e0c46 100644
--- a/offload/rmnet_offload_state.c
+++ b/offload/rmnet_offload_state.c
@@ -1,4 +1,5 @@
 /* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -12,6 +13,7 @@
 
 #include <linux/module.h>
 #include <linux/netdevice.h>
+#include <linux/rcupdate.h>
 #include "rmnet_map.h"
 #include "rmnet_private.h"
 #include "qmi_rmnet.h"
@@ -29,13 +31,13 @@ DATARMNETc2832b8f85)rmnet_map_dl_ind_deregister(DATARMNETf0d9de7e2f,&
 DATARMNET87b015f76f->DATARMNET8633ae8f1e);}static void DATARMNET345f805b34(void)
 {LIST_HEAD(DATARMNET6f9bfa17e6);if(!DATARMNETe05748b000)return;
 DATARMNETac9c8c14b1();DATARMNETba38823a2f();DATARMNET560e127137();
-DATARMNETae70636c90(&DATARMNET6f9bfa17e6);DATARMNETb98b78b8e3();kfree(
-DATARMNETe05748b000);DATARMNETe05748b000=NULL;}static int DATARMNETd68e3594a7(
-void){struct rmnet_port*DATARMNETf0d9de7e2f=DATARMNETe05748b000->
-DATARMNET403589239f;struct qmi_rmnet_ps_ind*DATARMNETbc78d7fd3c;struct 
-DATARMNET74bb35b8f2*DATARMNET87b015f76f;struct rmnet_map_dl_ind*
-DATARMNET8633ae8f1e;int DATARMNETb14e52a504=DATARMNET0529bb9c4e;
-DATARMNETbc78d7fd3c=&DATARMNETe05748b000->DATARMNET341393eda2;
+synchronize_rcu();DATARMNETae70636c90(&DATARMNET6f9bfa17e6);DATARMNETb98b78b8e3(
+);kfree(DATARMNETe05748b000);DATARMNETe05748b000=NULL;}static int 
+DATARMNETd68e3594a7(void){struct rmnet_port*DATARMNETf0d9de7e2f=
+DATARMNETe05748b000->DATARMNET403589239f;struct qmi_rmnet_ps_ind*
+DATARMNETbc78d7fd3c;struct DATARMNET74bb35b8f2*DATARMNET87b015f76f;struct 
+rmnet_map_dl_ind*DATARMNET8633ae8f1e;int DATARMNETb14e52a504=DATARMNET0529bb9c4e
+;DATARMNETbc78d7fd3c=&DATARMNETe05748b000->DATARMNET341393eda2;
 DATARMNETbc78d7fd3c->ps_on_handler=DATARMNET9292bebdd3;DATARMNETbc78d7fd3c->
 ps_off_handler=DATARMNETb7e47d7254;if(qmi_rmnet_ps_ind_register(
 DATARMNETf0d9de7e2f,DATARMNETbc78d7fd3c)){DATARMNETb14e52a504=