瀏覽代碼

wlan: Id84a54f87c991c546f3150c39246546088055574

Update to Id84a54f87c991c546f3150c39246546088055574

CRs-Fixed: 3070377
Change-Id: Id84a54f87c991c546f3150c39246546088055574
Signed-off-by: Subash Abhinov Kasiviswanathan <[email protected]>
Subash Abhinov Kasiviswanathan 3 年之前
父節點
當前提交
7886297a84
共有 2 個文件被更改,包括 27 次插入24 次删除
  1. 22 19
      wlan/rmnet_wlan_connection.c
  2. 5 5
      wlan/rmnet_wlan_genl.c

+ 22 - 19
wlan/rmnet_wlan_connection.c

@@ -65,13 +65,14 @@ IS_ERR(DATARMNET066b8bd537)){DATARMNET17f6bc1be5(DATARMNET72ab5e86d8);goto
 DATARMNETc1174a0f45;}DATARMNET3f85732c70=dst_neigh_lookup(&DATARMNET066b8bd537->
 dst,&DATARMNET099aa93adc.daddr);ip_rt_put(DATARMNET066b8bd537);if(!
 DATARMNET3f85732c70){DATARMNET17f6bc1be5(DATARMNET0e6bd55b8b);goto 
-DATARMNETc1174a0f45;}DATARMNET268a8314cf=neigh_resolve_output(
-DATARMNET3f85732c70,DATARMNET543491eb0f);neigh_release(DATARMNET3f85732c70);if(
-likely(DATARMNET268a8314cf==NET_XMIT_SUCCESS||DATARMNET268a8314cf==NET_XMIT_CN))
-{DATARMNET17f6bc1be5(DATARMNETc1b437465b);}else{DATARMNET17f6bc1be5(
-DATARMNET43a65c0be7);}return RX_HANDLER_CONSUMED;}else if(DATARMNET543491eb0f->
-dev&&(DATARMNET543491eb0f->protocol==htons(ETH_P_IPV6))&&!(strncmp(
-DATARMNET543491eb0f->dev->name,
+DATARMNETc1174a0f45;}if(DATARMNET3f85732c70->dev!=DATARMNET543491eb0f->dev){
+DATARMNET17f6bc1be5(DATARMNET64aecaa865);goto DATARMNETc1174a0f45;}
+DATARMNET268a8314cf=neigh_resolve_output(DATARMNET3f85732c70,DATARMNET543491eb0f
+);neigh_release(DATARMNET3f85732c70);if(likely(DATARMNET268a8314cf==
+NET_XMIT_SUCCESS||DATARMNET268a8314cf==NET_XMIT_CN)){DATARMNET17f6bc1be5(
+DATARMNETc1b437465b);}else{DATARMNET17f6bc1be5(DATARMNET43a65c0be7);}return 
+RX_HANDLER_CONSUMED;}else if(DATARMNET543491eb0f->dev&&(DATARMNET543491eb0f->
+protocol==htons(ETH_P_IPV6))&&!(strncmp(DATARMNET543491eb0f->dev->name,
 "\x72\x5f\x72\x6d\x6e\x65\x74\x5f\x64\x61\x74\x61\x30",IFNAMSIZ))){struct 
 ipv6hdr*DATARMNETbf55123e5b,DATARMNETcf1d9e2c1e;struct net_device*
 DATARMNET813ca18d06=NULL;struct flowi6 DATARMNET8fbe36a2fa={};struct neighbour*
@@ -89,18 +90,20 @@ ipv6_dst_lookup_flow(&init_net,NULL,&DATARMNET8fbe36a2fa,NULL);if(IS_ERR(dst)){
 DATARMNET17f6bc1be5(DATARMNETbf6e6853f9);goto DATARMNETc1174a0f45;}
 DATARMNET3f85732c70=dst_neigh_lookup(dst,&DATARMNET8fbe36a2fa.daddr);dst_release
 (dst);if(!DATARMNET3f85732c70){DATARMNET17f6bc1be5(DATARMNETa0da722329);goto 
-DATARMNETc1174a0f45;}DATARMNET268a8314cf=neigh_resolve_output(
-DATARMNET3f85732c70,DATARMNET543491eb0f);neigh_release(DATARMNET3f85732c70);if(
-likely(DATARMNET268a8314cf==NET_XMIT_SUCCESS||DATARMNET268a8314cf==NET_XMIT_CN))
-{DATARMNET17f6bc1be5(DATARMNET04311361a2);}else{DATARMNET17f6bc1be5(
-DATARMNET13bbe5f5c5);}return RX_HANDLER_CONSUMED;}return RX_HANDLER_PASS;
-DATARMNETc1174a0f45:kfree_skb(DATARMNET543491eb0f);return RX_HANDLER_CONSUMED;}
-static rx_handler_result_t DATARMNET68fe094884(struct sk_buff**
-DATARMNET89946cec52){struct DATARMNET0ca9d8ead7 DATARMNETa76763310b={};struct 
-DATARMNET4f49486833*DATARMNET63b1a086d5;struct sk_buff*DATARMNET543491eb0f=*
-DATARMNET89946cec52;unsigned long DATARMNETfb0677cc3c;if(!DATARMNET543491eb0f||
-DATARMNET543491eb0f->pkt_type==PACKET_LOOPBACK)return RX_HANDLER_PASS;if(
-DATARMNET543491eb0f->dev&&strncmp(DATARMNET543491eb0f->dev->name,
+DATARMNETc1174a0f45;}if(DATARMNET3f85732c70->dev!=DATARMNET543491eb0f->dev){
+DATARMNET17f6bc1be5(DATARMNET729e252fb9);goto DATARMNETc1174a0f45;}
+DATARMNET268a8314cf=neigh_resolve_output(DATARMNET3f85732c70,DATARMNET543491eb0f
+);neigh_release(DATARMNET3f85732c70);if(likely(DATARMNET268a8314cf==
+NET_XMIT_SUCCESS||DATARMNET268a8314cf==NET_XMIT_CN)){DATARMNET17f6bc1be5(
+DATARMNET04311361a2);}else{DATARMNET17f6bc1be5(DATARMNET13bbe5f5c5);}return 
+RX_HANDLER_CONSUMED;}return RX_HANDLER_PASS;DATARMNETc1174a0f45:kfree_skb(
+DATARMNET543491eb0f);return RX_HANDLER_CONSUMED;}static rx_handler_result_t 
+DATARMNET68fe094884(struct sk_buff**DATARMNET89946cec52){struct 
+DATARMNET0ca9d8ead7 DATARMNETa76763310b={};struct DATARMNET4f49486833*
+DATARMNET63b1a086d5;struct sk_buff*DATARMNET543491eb0f=*DATARMNET89946cec52;
+unsigned long DATARMNETfb0677cc3c;if(!DATARMNET543491eb0f||DATARMNET543491eb0f->
+pkt_type==PACKET_LOOPBACK)return RX_HANDLER_PASS;if(DATARMNET543491eb0f->dev&&
+strncmp(DATARMNET543491eb0f->dev->name,
 "\x72\x5f\x72\x6d\x6e\x65\x74\x5f\x64\x61\x74\x61\x30",IFNAMSIZ))nf_ct_set(
 DATARMNET543491eb0f,NULL,IP_CT_UNTRACKED);if(DATARMNET543491eb0f->protocol==
 htons(ETH_P_IP)){struct iphdr*DATARMNET86f1f2cdc9,DATARMNETbf6548198e;

+ 5 - 5
wlan/rmnet_wlan_genl.c

@@ -111,10 +111,10 @@ GENL_SET_ERR_MSG(DATARMNET54338da2ff,
 "\x4d\x75\x73\x74\x20\x73\x70\x65\x63\x69\x66\x79\x20\x46\x57\x44\x20\x64\x65\x76\x69\x63\x65\x20\x61\x6e\x64\x20\x61\x64\x64\x72\x65\x73\x73"
 );return-EINVAL;}DATARMNETef7cdd7b6b=DATARMNET54338da2ff->attrs[
 DATARMNETea4b56dc2b];DATARMNETd7f4d7c495=nla_data(DATARMNETef7cdd7b6b);if(strchr
-(DATARMNETd7f4d7c495,((char)(0x6a6+6758-0x20d2)))){if(in6_pton(
-DATARMNETd7f4d7c495,nla_len(DATARMNETef7cdd7b6b),DATARMNET2d4b4cfc9e.
-DATARMNET5700daac01.s6_addr,-(0xd26+209-0xdf6),NULL)!=(0xd26+209-0xdf6)){
-GENL_SET_ERR_MSG(DATARMNET54338da2ff,
+(DATARMNETd7f4d7c495,((char)(0x580+747-0x831)))){if(in6_pton(DATARMNETd7f4d7c495
+,nla_len(DATARMNETef7cdd7b6b),DATARMNET2d4b4cfc9e.DATARMNET5700daac01.s6_addr,-
+(0xd26+209-0xdf6),NULL)!=(0xd26+209-0xdf6)){GENL_SET_ERR_MSG(DATARMNET54338da2ff
+,
 "\x46\x57\x44\x20\x61\x64\x64\x72\x65\x73\x73\x20\x69\x73\x20\x69\x6e\x76\x61\x6c\x69\x64\x20\x69\x6e\x20\x49\x50\x76\x36"
 );return-EINVAL;}DATARMNET2d4b4cfc9e.DATARMNET0d956cc77a=(0xd03+244-0xdf1);}else
 {if(in4_pton(DATARMNETd7f4d7c495,nla_len(DATARMNETef7cdd7b6b),(u8*)&
@@ -138,7 +138,7 @@ GENL_SET_ERR_MSG(DATARMNET54338da2ff,
 "\x4d\x75\x73\x74\x20\x73\x70\x65\x63\x69\x66\x79\x20\x46\x57\x44\x20\x64\x65\x76\x69\x63\x65\x20\x61\x6e\x64\x20\x61\x64\x64\x72\x65\x73\x73"
 );return-EINVAL;}DATARMNETef7cdd7b6b=DATARMNET54338da2ff->attrs[
 DATARMNETea4b56dc2b];DATARMNETd7f4d7c495=nla_data(DATARMNETef7cdd7b6b);if(strchr
-(DATARMNETd7f4d7c495,((char)(0x13a0+4779-0x2611)))){if(in6_pton(
+(DATARMNETd7f4d7c495,((char)(0xa77+4667-0x1c78)))){if(in6_pton(
 DATARMNETd7f4d7c495,nla_len(DATARMNETef7cdd7b6b),DATARMNET2d4b4cfc9e.
 DATARMNET5700daac01.s6_addr,-(0xd26+209-0xdf6),NULL)!=(0xd26+209-0xdf6)){
 GENL_SET_ERR_MSG(DATARMNET54338da2ff,