From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66375C4338F for ; Mon, 16 Aug 2021 19:53:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3EA3260F55 for ; Mon, 16 Aug 2021 19:53:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231477AbhHPTxe (ORCPT ); Mon, 16 Aug 2021 15:53:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230148AbhHPTxd (ORCPT ); Mon, 16 Aug 2021 15:53:33 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FA40C061764 for ; Mon, 16 Aug 2021 12:53:01 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id hs10so34000340ejc.0 for ; Mon, 16 Aug 2021 12:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=8lgyJGRgDxL+7EV3lsessMu+2P8lLZajPY12zWAS8Rk=; b=GxA8vr1tUdrgUmpg81RTssNjnZAbYxeh9lVuNYJHJKcfnkNM3FI9FZKbXOnfSm4ewN 6SHKQ9NlMjil9enlGBZY8KUKz0u+X8eyDW7woEUUcrOO5tsK1HmZBXp4rqknAZ8rkQLv 5RffEdgYtkiWc69fZBaZ7M9Mdqf3lgIsNa7cZlPZuhdQjJkYxKuFspa9excPAKDsBAtl 6KbkT678itYlmzmtYmNVFBaPwacVpZzhI2zCRI3Dl8wpgYveAgwsUUysou/TburWx/Dj KG9r5h/Ru8a401PdPbOIQXHu0v+2OtW17qzZ1q8W0s6XrlXkd1gpsduphBuMkW8/hQ9O kf5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=8lgyJGRgDxL+7EV3lsessMu+2P8lLZajPY12zWAS8Rk=; b=eZjeY9ByiIf+54+2UEBbabImGdZwHAMBUh/hD5d0nrCIcjO8dgEc79b1Z+UKJrZnpi rmY0DSCD3dTEi7d2i3UkO7VofruFI806yHh9ou6RI+eP584h0BW29YLiqbu1rtXYpcix q4Pn/XPbiT64lqgzFxaOJ/WDBKp/PjOylK52i8SoxXLv6gKzjNpP+82ry8E0dtUydiy4 CehiERjFHYXjSnLsPw9gySfYEZ4TXzG8Juuv7MJhthSj2K0UyTHaHyuHPsXmaokK6JPb q1oLkHF1VsTR1EXZWvlQ9PllcEVfaYNXFkbtJEShRsib/eOmwxucjquuT2E50Y0suGwc SzXg== X-Gm-Message-State: AOAM533BOiyi0LhJu9mVFttivzQz4tkSiIJc0MbC7Xfc9n7jddGiMkjE GrJgMPBOlwHCxVcGVwqFDy7RsAbFMfE= X-Google-Smtp-Source: ABdhPJwWAwcO01+dzaxf6gvaal4zzQ62zxb/zODiJFs1S+ZDgUCJFxUkoc2ceYovmd/EwbuJikLCmw== X-Received: by 2002:a17:906:e85:: with SMTP id p5mr128987ejf.159.1629143579987; Mon, 16 Aug 2021 12:52:59 -0700 (PDT) Received: from ?IPv6:2a02:8108:96c0:3b88::4058? ([2a02:8108:96c0:3b88::4058]) by smtp.gmail.com with ESMTPSA id n2sm57360edi.32.2021.08.16.12.52.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Aug 2021 12:52:58 -0700 (PDT) Subject: Re: [PATCH v2 2/3] staging: r8188eu: Remove code depending on NAT25_LOOKUP To: "Fabio M. De Francesco" , Greg Kroah-Hartman , Larry Finger , Phillip Potter , Martin Kaiser , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org References: <20210816175138.21633-1-fmdefrancesco@gmail.com> From: Michael Straube Message-ID: <058cfb5e-623f-feb5-f963-5615bff25c5a@gmail.com> Date: Mon, 16 Aug 2021 21:52:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210816175138.21633-1-fmdefrancesco@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/16/21 7:51 PM, Fabio M. De Francesco wrote: > 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. > > Signed-off-by: Fabio M. De Francesco > --- > > v2: Patch rebased against the latest Greg K-H's tree. > > drivers/staging/r8188eu/core/rtw_br_ext.c | 112 ------------------- > drivers/staging/r8188eu/include/rtw_br_ext.h | 1 - > 2 files changed, 113 deletions(-) > > diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c > index e8eea95a52e3..0402f48319c4 100644 > --- a/drivers/staging/r8188eu/core/rtw_br_ext.c > +++ b/drivers/staging/r8188eu/core/rtw_br_ext.c > @@ -484,27 +484,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; > } > @@ -536,20 +515,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 +602,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 +614,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 +626,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 +672,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; > } > diff --git a/drivers/staging/r8188eu/include/rtw_br_ext.h b/drivers/staging/r8188eu/include/rtw_br_ext.h > index 00d461c4c6fa..69905d30c191 100644 > --- a/drivers/staging/r8188eu/include/rtw_br_ext.h > +++ b/drivers/staging/r8188eu/include/rtw_br_ext.h > @@ -31,7 +31,6 @@ enum NAT25_METHOD { > NAT25_MIN, > NAT25_CHECK, > NAT25_INSERT, > - NAT25_LOOKUP, > NAT25_PARSE, > NAT25_MAX > }; > Acked-by: Michael Straube