ソースを参照

shs: I4104b8348b82f7d72c1fa5a1799aaac2bfa094b5

Update to I4104b8348b82f7d72c1fa5a1799aaac2bfa094b5

Change-Id: I4104b8348b82f7d72c1fa5a1799aaac2bfa094b5
Signed-off-by: Conner Huff <[email protected]>
Conner Huff 2 年 前
コミット
a4f750b06a
3 ファイル変更19 行追加16 行削除
  1. 10 10
      shs/rmnet_shs_main.c
  2. 5 3
      shs/rmnet_shs_wq_mem.c
  3. 4 3
      shs/rmnet_shs_wq_mem.h

+ 10 - 10
shs/rmnet_shs_main.c

@@ -40,16 +40,16 @@
 #include <linux/cpumask.h>
 #include <linux/icmp.h>
 #include <linux/inet.h>
-static char*verinfo[]={"\x62\x38\x38\x39\x38\x62\x66\x32",
-"\x33\x35\x32\x37\x62\x38\x30\x65","\x63\x30\x39\x37\x35\x35\x62\x33",
-"\x32\x36\x66\x64\x33\x30\x36\x35","\x65\x36\x66\x64\x34\x31\x33\x37",
-"\x36\x64\x38\x31\x37\x39\x62\x63","\x64\x66\x39\x32\x65\x35\x33\x34",
-"\x30\x38\x61\x39\x34\x38\x64\x61","\x36\x35\x35\x37\x37\x63\x32\x32",
-"\x65\x35\x37\x30\x63\x30\x35\x63","\x30\x63\x61\x37\x61\x62\x38\x30",
-"\x63\x30\x33\x31\x36\x31\x63\x66","\x35\x61\x66\x31\x30\x31\x31\x64",
-"\x36\x38\x36\x36\x36\x32\x33\x32","\x65\x32\x31\x38\x66\x34\x35\x31"};
-module_param_array(verinfo,charp,NULL,(0xcb7+5769-0x221c));MODULE_PARM_DESC(
-verinfo,
+static char*verinfo[]={"\x62\x66\x61\x30\x39\x34\x62\x35"
+"\x62\x38\x38\x39\x38\x62\x66\x32","\x33\x35\x32\x37\x62\x38\x30\x65",
+"\x63\x30\x39\x37\x35\x35\x62\x33","\x32\x36\x66\x64\x33\x30\x36\x35",
+"\x65\x36\x66\x64\x34\x31\x33\x37","\x36\x64\x38\x31\x37\x39\x62\x63",
+"\x64\x66\x39\x32\x65\x35\x33\x34","\x30\x38\x61\x39\x34\x38\x64\x61",
+"\x36\x35\x35\x37\x37\x63\x32\x32","\x65\x35\x37\x30\x63\x30\x35\x63",
+"\x30\x63\x61\x37\x61\x62\x38\x30","\x63\x30\x33\x31\x36\x31\x63\x66",
+"\x35\x61\x66\x31\x30\x31\x31\x64","\x36\x38\x36\x36\x36\x32\x33\x32",
+"\x65\x32\x31\x38\x66\x34\x35\x31"};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"
 );
 #define DATARMNET2f67183a86 2000000

+ 5 - 3
shs/rmnet_shs_wq_mem.c

@@ -603,8 +603,9 @@ DATARMNET835a28686c);if(!DATARMNET835a28686c){rm_err("\x25\x73",
 ,idx);memcpy(((char*)DATARMNET835a28686c->data),&idx,sizeof(idx));memcpy(((char*
 )DATARMNET835a28686c->data+sizeof(uint16_t)),(void*)&DATARMNET2fdef9da24[
 (0xd2d+202-0xdf7)],sizeof(DATARMNET2fdef9da24));}void DATARMNET78666f33a1(void){
-struct rmnet_priv*priv;struct DATARMNET9b44b71ee9*ep=NULL;u16 idx=
-(0xd2d+202-0xdf7);u16 count=(0xd2d+202-0xdf7);rm_err(
+struct rmnet_priv*priv;struct rmnet_port*port;struct DATARMNET9b44b71ee9*ep=NULL
+;u16 idx=(0xd2d+202-0xdf7);u16 count=(0xd2d+202-0xdf7);port=DATARMNETecc0627c70.
+port;if(!port){DATARMNET68d84e7b98[DATARMNET42b73d0f3f]++;return;}rm_err(
 "\x53\x48\x53\x5f\x4e\x45\x54\x44\x45\x56\x3a\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x65\x6e\x74\x65\x72\x20\x25\x75" "\n"
 ,idx);list_for_each_entry(ep,&DATARMNET30a3e83974,DATARMNET0763436b8d){count+=
 (0xd26+209-0xdf6);rm_err(
@@ -634,7 +635,8 @@ coal.close.hw_evict;DATARMNETf46265286b[idx].coal_tcp=priv->stats.coal.coal_tcp;
 DATARMNETf46265286b[idx].coal_tcp_bytes=priv->stats.coal.coal_tcp_bytes;
 DATARMNETf46265286b[idx].coal_udp=priv->stats.coal.coal_udp;DATARMNETf46265286b[
 idx].coal_udp_bytes=priv->stats.coal.coal_udp_bytes;DATARMNETf46265286b[idx].
-mux_id=priv->mux_id;strlcpy(DATARMNETf46265286b[idx].name,ep->ep->name,sizeof(
+mux_id=priv->mux_id;DATARMNETf46265286b[idx].pb_marker_seq=port->stats.
+pb_marker_seq;strlcpy(DATARMNETf46265286b[idx].name,ep->ep->name,sizeof(
 DATARMNETf46265286b[idx].name));DATARMNETf46265286b[idx].DATARMNET870c3dafcb=
 priv->stats.coal.coal_pkts;DATARMNETf46265286b[idx].DATARMNET4eb77c78e6=ep->
 DATARMNET4eb77c78e6;DATARMNETf46265286b[idx].DATARMNET257fc4b2d4=ep->

+ 4 - 3
shs/rmnet_shs_wq_mem.h

@@ -15,6 +15,7 @@
 #ifndef DATARMNETe10fe0b1e0
 #define DATARMNETe10fe0b1e0
 #include "rmnet_shs.h"
+#include "rmnet_shs_config.h"
 #define DATARMNET6517f07a36      "\x73\x68\x73"
 #define DATARMNET41be983a65     \
 "\x72\x6d\x6e\x65\x74\x5f\x73\x68\x73\x5f\x63\x61\x70\x73"
@@ -56,9 +57,9 @@ DATARMNET0d682bcb29;u64 DATARMNET20e8fc9db8;u32 hash;u16 DATARMNET42a992465f;u16
  trans_proto;u8 mux_id;};struct __attribute__((__packed__))DATARMNET57ccbe14f3{
 char name[DATARMNET9ae5f81f71];u64 DATARMNET77de6e34f2;u64 hw_evict;u64 
 DATARMNET870c3dafcb;u64 coal_tcp;u64 coal_tcp_bytes;u64 coal_udp;u64 
-coal_udp_bytes;u64 DATARMNET257fc4b2d4;u64 DATARMNET4eb77c78e6;u8 mux_id;};
-extern struct list_head DATARMNET6c23f11e81;extern struct list_head 
-DATARMNETf91b305f4e;extern struct list_head DATARMNET3208cd0982;extern struct 
+coal_udp_bytes;u64 DATARMNET257fc4b2d4;u64 DATARMNET4eb77c78e6;u64 pb_marker_seq
+;u8 mux_id;};extern struct list_head DATARMNET6c23f11e81;extern struct list_head
+ DATARMNETf91b305f4e;extern struct list_head DATARMNET3208cd0982;extern struct 
 list_head DATARMNET922b4752e2;extern struct list_head DATARMNETe46ae760db;enum{
 DATARMNETbd4083a6a4=(0x24f5+499-0x16e8)};struct DATARMNETa41d4c4a12{char*data;
 refcount_t refcnt;};void DATARMNET28a80d526e(struct DATARMNET6c78e47d24*