staging: r8188eu: Remove code depending on NAT25_LOOKUP
authorFabio M. De Francesco <fmdefrancesco@gmail.com>
Tue, 17 Aug 2021 18:57:23 +0000 (20:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Aug 2021 08:09:38 +0000 (10:09 +0200)
Remove all the code related to the management of the NAT25_LOOKUP
method in nat25_db_handle(). The only function that used that method was
the now deleted nat25_handle_frame(). Remove the NAT25_LOOKUP entry from
the NAT25_METHOD enum because it is not anymore used everywhere else in
the code of the driver.

Remove the 'sender' pointer to integer. Remove
__nat25_db_network_lookup_and_replace(). Following the deletion of the
code related to the NAT25_LOOKUP method, they are no more needed.

Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Link: https://lore.kernel.org/r/20210817185723.15192-1-fmdefrancesco@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_br_ext.c
drivers/staging/r8188eu/include/rtw_br_ext.h

index e8eea95..ee52f28 100644 (file)
@@ -295,56 +295,6 @@ static void __network_hash_unlink(struct nat25_network_db_entry *ent)
        ent->pprev_hash = NULL;
 }
 
-static int __nat25_db_network_lookup_and_replace(struct adapter *priv,
-                               struct sk_buff *skb, unsigned char *networkAddr)
-{
-       struct nat25_network_db_entry *db;
-
-       spin_lock_bh(&priv->br_ext_lock);
-
-       db = priv->nethash[__nat25_network_hash(networkAddr)];
-       while (db) {
-               if (!memcmp(db->networkAddr, networkAddr, MAX_NETWORK_ADDR_LEN)) {
-                       if (!__nat25_has_expired(priv, db)) {
-                               /*  replace the destination mac address */
-                               memcpy(skb->data, db->macAddr, ETH_ALEN);
-                               atomic_inc(&db->use_count);
-
-                               DEBUG_INFO("NAT25: Lookup M:%02x%02x%02x%02x%02x%02x N:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
-                                                       "%02x%02x%02x%02x%02x%02x\n",
-                                       db->macAddr[0],
-                                       db->macAddr[1],
-                                       db->macAddr[2],
-                                       db->macAddr[3],
-                                       db->macAddr[4],
-                                       db->macAddr[5],
-                                       db->networkAddr[0],
-                                       db->networkAddr[1],
-                                       db->networkAddr[2],
-                                       db->networkAddr[3],
-                                       db->networkAddr[4],
-                                       db->networkAddr[5],
-                                       db->networkAddr[6],
-                                       db->networkAddr[7],
-                                       db->networkAddr[8],
-                                       db->networkAddr[9],
-                                       db->networkAddr[10],
-                                       db->networkAddr[11],
-                                       db->networkAddr[12],
-                                       db->networkAddr[13],
-                                       db->networkAddr[14],
-                                       db->networkAddr[15],
-                                       db->networkAddr[16]);
-                       }
-                       spin_unlock_bh(&priv->br_ext_lock);
-                       return 1;
-               }
-               db = db->next_hash;
-       }
-       spin_unlock_bh(&priv->br_ext_lock);
-       return 0;
-}
-
 static void __nat25_db_network_insert(struct adapter *priv,
                                unsigned char *macAddr, unsigned char *networkAddr)
 {
@@ -484,27 +434,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
 
                        __nat25_db_print(priv);
                        return 0;
-               case NAT25_LOOKUP:
-                       DEBUG_INFO("NAT25: Lookup IP, SA =%08x, DA =%08x\n", iph->saddr, iph->daddr);
-                       tmp = be32_to_cpu(iph->daddr);
-                       __nat25_generate_ipv4_network_addr(networkAddr, &tmp);
-
-                       if (!__nat25_db_network_lookup_and_replace(priv, skb, networkAddr)) {
-                               if (*((unsigned char *)&iph->daddr + 3) == 0xff) {
-                                       /*  L2 is unicast but L3 is broadcast, make L2 bacome broadcast */
-                                       DEBUG_INFO("NAT25: Set DA as boardcast\n");
-                                       memset(skb->data, 0xff, ETH_ALEN);
-                               } else {
-                                       /*  forward unknow IP packet to upper TCP/IP */
-                                       DEBUG_INFO("NAT25: Replace DA with BR's MAC\n");
-                                       if ((*(u32 *)priv->br_mac) == 0 && (*(u16 *)(priv->br_mac+4)) == 0) {
-                                               printk("Re-init netdev_br_init() due to br_mac == 0!\n");
-                                               netdev_br_init(priv->pnetdev);
-                                       }
-                                       memcpy(skb->data, priv->br_mac, ETH_ALEN);
-                               }
-                       }
-                       return 0;
                default:
                        return -1;
                }
@@ -514,7 +443,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
                /*---------------------------------------------------*/
                struct arphdr *arp = (struct arphdr *)(skb->data + ETH_HLEN);
                unsigned char *arp_ptr = (unsigned char *)(arp + 1);
-               unsigned int *sender, *target;
+               unsigned int *sender;
 
                if (arp->ar_pro != __constant_htons(ETH_P_IP)) {
                        DEBUG_WARN("NAT25: arp protocol unknown (%4x)!\n", be16_to_cpu(arp->ar_pro));
@@ -536,20 +465,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
                        __nat25_db_network_insert(priv, skb->data+ETH_ALEN, networkAddr);
                        __nat25_db_print(priv);
                        return 0;
-               case NAT25_LOOKUP:
-                       DEBUG_INFO("NAT25: Lookup ARP\n");
-
-                       arp_ptr += arp->ar_hln;
-                       sender = (unsigned int *)arp_ptr;
-                       arp_ptr += (arp->ar_hln + arp->ar_pln);
-                       target = (unsigned int *)arp_ptr;
-                       __nat25_generate_ipv4_network_addr(networkAddr, target);
-                       __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-                       /*  change to ARP target mac address to Lookup result */
-                       arp_ptr = (unsigned char *)(arp + 1);
-                       arp_ptr += (arp->ar_hln + arp->ar_pln);
-                       memcpy(arp_ptr, skb->data, ETH_ALEN);
-                       return 0;
                default:
                        return -1;
                }
@@ -637,70 +552,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
                                        priv->pppoe_connection_in_progress = 0;
                        }
                        return 0;
-               case NAT25_LOOKUP:
-                       if (ph->code == PADO_CODE || ph->code == PADS_CODE) {
-                               if (priv->ethBrExtInfo.addPPPoETag) {
-                                       struct pppoe_tag *tag;
-                                       unsigned char *ptr;
-                                       unsigned short tagType, tagLen;
-                                       int offset = 0;
-
-                                       ptr = __nat25_find_pppoe_tag(ph, ntohs(PTT_RELAY_SID));
-                                       if (!ptr) {
-                                               DEBUG_ERR("Fail to find PTT_RELAY_SID in FADO!\n");
-                                               return -1;
-                                       }
-
-                                       tag = (struct pppoe_tag *)ptr;
-                                       tagType = (unsigned short)((ptr[0] << 8) + ptr[1]);
-                                       tagLen = (unsigned short)((ptr[2] << 8) + ptr[3]);
-
-                                       if ((tagType != ntohs(PTT_RELAY_SID)) || (tagLen < (MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN))) {
-                                               DEBUG_ERR("Invalid PTT_RELAY_SID tag length [%d]!\n", tagLen);
-                                               return -1;
-                                       }
-
-                                       pMagic = (unsigned short *)tag->tag_data;
-                                       if (ntohs(*pMagic) != MAGIC_CODE) {
-                                               DEBUG_ERR("Can't find MAGIC_CODE in %s packet!\n",
-                                                       (ph->code == PADO_CODE ? "PADO" : "PADS"));
-                                               return -1;
-                                       }
-
-                                       memcpy(skb->data, tag->tag_data+MAGIC_CODE_LEN, ETH_ALEN);
-
-                                       if (tagLen > MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN)
-                                               offset = TAG_HDR_LEN;
-
-                                       if (skb_pull_and_merge(skb, ptr+offset, TAG_HDR_LEN+MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN-offset) < 0) {
-                                               DEBUG_ERR("call skb_pull_and_merge() failed in PADO packet!\n");
-                                               return -1;
-                                       }
-                                       ph->length = htons(ntohs(ph->length)-(TAG_HDR_LEN+MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN-offset));
-                                       if (offset > 0)
-                                               tag->tag_len = htons(tagLen-MAGIC_CODE_LEN-RTL_RELAY_TAG_LEN);
-
-                                       DEBUG_INFO("NAT25: Lookup PPPoE, forward %s Packet from %s\n",
-                                               (ph->code == PADO_CODE ? "PADO" : "PADS"),      skb->dev->name);
-                               } else { /*  not add relay tag */
-                                       if (!priv->pppoe_connection_in_progress) {
-                                               DEBUG_ERR("Discard PPPoE packet due to no connection in progresss!\n");
-                                               return -1;
-                                       }
-                                       memcpy(skb->data, priv->pppoe_addr, ETH_ALEN);
-                                       priv->pppoe_connection_in_progress = WAIT_TIME_PPPOE;
-                               }
-                       } else {
-                               if (ph->sid != 0) {
-                                       DEBUG_INFO("NAT25: Lookup PPPoE, lookup session packet from %s\n", skb->dev->name);
-                                       __nat25_generate_pppoe_network_addr(networkAddr, skb->data+ETH_ALEN, &ph->sid);
-                                       __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-                                       __nat25_db_print(priv);
-                               } else {
-                                       return -1;
-                               }
-                       }
-                       return 0;
                default:
                        return -1;
                }
@@ -713,8 +564,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
                        return -1;
                case NAT25_INSERT:
                        return 0;
-               case NAT25_LOOKUP:
-                       return 0;
                default:
                        return -1;
                }
@@ -727,8 +576,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
                        return -1;
                case NAT25_INSERT:
                        return 0;
-               case NAT25_LOOKUP:
-                       return 0;
                default:
                        return -1;
                }
@@ -775,15 +622,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
                                }
                        }
                        return 0;
-               case NAT25_LOOKUP:
-                       DEBUG_INFO("NAT25: Lookup IP, SA =%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x, DA =%4x:%4x:%4x:%4x:%4x:%4x:%4x:%4x\n",
-                                  iph->saddr.s6_addr16[0], iph->saddr.s6_addr16[1], iph->saddr.s6_addr16[2], iph->saddr.s6_addr16[3],
-                                  iph->saddr.s6_addr16[4], iph->saddr.s6_addr16[5], iph->saddr.s6_addr16[6], iph->saddr.s6_addr16[7],
-                                  iph->daddr.s6_addr16[0], iph->daddr.s6_addr16[1], iph->daddr.s6_addr16[2], iph->daddr.s6_addr16[3],
-                                  iph->daddr.s6_addr16[4], iph->daddr.s6_addr16[5], iph->daddr.s6_addr16[6], iph->daddr.s6_addr16[7]);
-                       __nat25_generate_ipv6_network_addr(networkAddr, (unsigned int *)&iph->daddr);
-                       __nat25_db_network_lookup_and_replace(priv, skb, networkAddr);
-                       return 0;
                default:
                        return -1;
                }
index 00d461c..69905d3 100644 (file)
@@ -31,7 +31,6 @@ enum NAT25_METHOD {
        NAT25_MIN,
        NAT25_CHECK,
        NAT25_INSERT,
-       NAT25_LOOKUP,
        NAT25_PARSE,
        NAT25_MAX
 };