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=-16.3 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 D1A54C4338F for ; Mon, 23 Aug 2021 23:53:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A52A360E8B for ; Mon, 23 Aug 2021 23:53:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233438AbhHWXyJ (ORCPT ); Mon, 23 Aug 2021 19:54:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233478AbhHWXyB (ORCPT ); Mon, 23 Aug 2021 19:54:01 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68BFCC061757 for ; Mon, 23 Aug 2021 16:53:18 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id u1so11623958wmm.0 for ; Mon, 23 Aug 2021 16:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=6d0yPS4kuzXZDPO9/yKbI53HdF+elQfiteyFvoIw4ZQ=; b=jwbKj9PPZT/4vSNn3XRnv4/ImqvCrNSU5z2Z7dxTL9GTHzEQo/oMBxcuYRJ/KMGIlH vY9YvB2v9/ibOcfsvetLOaZRbD86hLpfNcr6xjQihi18ZGrUnxfJwvfQ2GxSG2v5BtNf 14qeRddC4WQXhZniZvIVTh6HU61LrHQuTms2hRsj4kvNlsQn8x1bcnc6nXC+sLYfoghu 7w8YiaK1OkJQhjmvGJvN5wyd46ko7x3H2t6MVnDNO7srxpUuBTMONcpLSXlU1hVAikXs N+PwPbNUWyxB097FIJJe6GXIEN7DNqK/7QEOVTTzpweXyh0pobGhX9B2/EydzYs/xEdB PGcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=6d0yPS4kuzXZDPO9/yKbI53HdF+elQfiteyFvoIw4ZQ=; b=QWAzJ3eu84EvjOpNngoj5yQc/ezeje5KfYHSos3aPEXLQ9Mhm5h5FZSffToG0Ae0oF mUwleOE7GKTgyOayJMUEL1nZYzGlhNRRKEalgGwVBne0trQ/dBJHVoufn7vmq+DYk/bC MyA/FbEhLA/ciPEnpSmgdtXKmyrqxafBabe59uf+tsFz+m89P7ZsBtNQ6LsVsvKUEA/q Gq4YA5G9fx8aWAjYwSOhP+fN6/PeP/s1YUYUDuCzf1BsT2hA2FaU4FU8Cb67K7VH9DxI MuQKzy/3n+y9p3kYboLl5Fh0j2l0gxNl1+SzbPandIGKJaBNDeda/NgA1hJOPxzk5ird cATw== X-Gm-Message-State: AOAM531pHIu/2VCvFpcrvn8yAhn9GtLckPvms+hzIujS8q3U2MEXiwQK 40IGaHUMwQsD2VE6lCY9q7pr7R6eOQE= X-Google-Smtp-Source: ABdhPJwUt722Ts8+xazKtioDgWjkzA6a8eHxXfQouy6P8NJN/5Q5uWF51U0jBpyvqwgHAxccnF86VQ== X-Received: by 2002:a05:600c:4e8b:: with SMTP id f11mr1097785wmq.165.1629762797069; Mon, 23 Aug 2021 16:53:17 -0700 (PDT) Received: from ?IPv6:2a02:8108:96c0:3b88::687e? ([2a02:8108:96c0:3b88::687e]) by smtp.gmail.com with ESMTPSA id m12sm2736wrq.29.2021.08.23.16.53.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 23 Aug 2021 16:53:16 -0700 (PDT) Subject: Re: [PATCH v2] staging: r8188eu: remove ip.h header file To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, martin@kaiser.cx, fmdefrancesco@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org References: <20210823082814.10083-1-straube.linux@gmail.com> From: Michael Straube Message-ID: <2c5cd364-e8d4-57f8-5e0d-6c03d10e7813@gmail.com> Date: Tue, 24 Aug 2021 01:52:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20210823082814.10083-1-straube.linux@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/23/21 10:28 AM, Michael Straube wrote: > The struct ip_options declared in ip.h is only unsed in the optlength > macro which is also defined in ip.h and not used in the driver code. > All other definitions/declarations in ip.h are duplicated from > . Remove the ip.h header file and its includes. > > Signed-off-by: Michael Straube > --- > v1 -> v2 > Updated the commit message to make clear that the optlength macro is > unused. > > drivers/staging/r8188eu/core/rtw_recv.c | 1 - > drivers/staging/r8188eu/core/rtw_xmit.c | 1 - > drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 1 - > drivers/staging/r8188eu/include/ip.h | 109 ------------------- > drivers/staging/r8188eu/os_dep/xmit_linux.c | 1 - > 5 files changed, 113 deletions(-) > delete mode 100644 drivers/staging/r8188eu/include/ip.h > > diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r8188eu/core/rtw_recv.c > index 52236bae8693..8802f24fec3a 100644 > --- a/drivers/staging/r8188eu/core/rtw_recv.c > +++ b/drivers/staging/r8188eu/core/rtw_recv.c > @@ -7,7 +7,6 @@ > #include "../include/drv_types.h" > #include "../include/recv_osdep.h" > #include "../include/mlme_osdep.h" > -#include "../include/ip.h" > #include "../include/if_ether.h" > #include "../include/ethernet.h" > #include "../include/usb_ops.h" > diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c > index f242f3ffca70..38183fd37b93 100644 > --- a/drivers/staging/r8188eu/core/rtw_xmit.c > +++ b/drivers/staging/r8188eu/core/rtw_xmit.c > @@ -7,7 +7,6 @@ > #include "../include/drv_types.h" > #include "../include/wifi.h" > #include "../include/osdep_intf.h" > -#include "../include/ip.h" > #include "../include/usb_ops.h" > #include "../include/usb_osintf.h" > > diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c > index a44c9598186c..216a752e6246 100644 > --- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c > +++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c > @@ -6,7 +6,6 @@ > #include "../include/drv_types.h" > #include "../include/recv_osdep.h" > #include "../include/mlme_osdep.h" > -#include "../include/ip.h" > #include "../include/if_ether.h" > #include "../include/ethernet.h" > > diff --git a/drivers/staging/r8188eu/include/ip.h b/drivers/staging/r8188eu/include/ip.h > deleted file mode 100644 > index b7388c8c1b8a..000000000000 > --- a/drivers/staging/r8188eu/include/ip.h > +++ /dev/null > @@ -1,109 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ > -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ > - > -#ifndef _LINUX_IP_H > -#define _LINUX_IP_H > - > -/* SOL_IP socket options */ > - > -#define IPTOS_TOS_MASK 0x1E > -#define IPTOS_TOS(tos) ((tos)&IPTOS_TOS_MASK) > -#define IPTOS_LOWDELAY 0x10 > -#define IPTOS_THROUGHPUT 0x08 > -#define IPTOS_RELIABILITY 0x04 > -#define IPTOS_MINCOST 0x02 > - > -#define IPTOS_PREC_MASK 0xE0 > -#define IPTOS_PREC(tos) ((tos)&IPTOS_PREC_MASK) > -#define IPTOS_PREC_NETCONTROL 0xe0 > -#define IPTOS_PREC_INTERNETCONTROL 0xc0 > -#define IPTOS_PREC_CRITIC_ECP 0xa0 > -#define IPTOS_PREC_FLASHOVERRIDE 0x80 > -#define IPTOS_PREC_FLASH 0x60 > -#define IPTOS_PREC_IMMEDIATE 0x40 > -#define IPTOS_PREC_PRIORITY 0x20 > -#define IPTOS_PREC_ROUTINE 0x00 > - > -/* IP options */ > -#define IPOPT_COPY 0x80 > -#define IPOPT_CLASS_MASK 0x60 > -#define IPOPT_NUMBER_MASK 0x1f > - > -#define IPOPT_COPIED(o) ((o)&IPOPT_COPY) > -#define IPOPT_CLASS(o) ((o)&IPOPT_CLASS_MASK) > -#define IPOPT_NUMBER(o) ((o)&IPOPT_NUMBER_MASK) > - > -#define IPOPT_CONTROL 0x00 > -#define IPOPT_RESERVED1 0x20 > -#define IPOPT_MEASUREMENT 0x40 > -#define IPOPT_RESERVED2 0x60 > - > -#define IPOPT_END (0 | IPOPT_CONTROL) > -#define IPOPT_NOOP (1 | IPOPT_CONTROL) > -#define IPOPT_SEC (2 | IPOPT_CONTROL | IPOPT_COPY) > -#define IPOPT_LSRR (3 | IPOPT_CONTROL | IPOPT_COPY) > -#define IPOPT_TIMESTAMP (4 | IPOPT_MEASUREMENT) > -#define IPOPT_RR (7 | IPOPT_CONTROL) > -#define IPOPT_SID (8 | IPOPT_CONTROL | IPOPT_COPY) > -#define IPOPT_SSRR (9 | IPOPT_CONTROL | IPOPT_COPY) > -#define IPOPT_RA (20 | IPOPT_CONTROL | IPOPT_COPY) > - > -#define IPVERSION 4 > -#define MAXTTL 255 > -#define IPDEFTTL 64 > -#define IPOPT_OPTVAL 0 > -#define IPOPT_OLEN 1 > -#define IPOPT_OFFSET 2 > -#define IPOPT_MINOFF 4 > -#define MAX_IPOPTLEN 40 > -#define IPOPT_NOP IPOPT_NOOP > -#define IPOPT_EOL IPOPT_END > -#define IPOPT_TS IPOPT_TIMESTAMP > - > -#define IPOPT_TS_TSONLY 0 /* timestamps only */ > -#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */ > -#define IPOPT_TS_PRESPEC 3 /* specified modules only */ > - > -struct ip_options { > - __u32 faddr; /* Saved first hop address */ > - unsigned char optlen; > - unsigned char srr; > - unsigned char rr; > - unsigned char ts; > - unsigned char is_setbyuser:1, /* Set by setsockopt? */ > - is_data:1, /* Options in __data, rather than skb*/ > - is_strictroute:1,/* Strict source route */ > - srr_is_hit:1, /* Packet destn addr was ours */ > - is_changed:1, /* IP checksum more not valid */ > - rr_needaddr:1, /* Need to record addr of out dev*/ > - ts_needtime:1, /* Need to record timestamp */ > - ts_needaddr:1; /* Need to record addr of out dev */ > - unsigned char router_alert; > - unsigned char __pad1; > - unsigned char __pad2; > - unsigned char __data[0]; > -}; > - > -#define optlength(opt) (sizeof(struct ip_options) + opt->optlen) > - > -struct iphdr { > -#if defined(__LITTLE_ENDIAN_BITFIELD) > - __u8 ihl:4, > - version:4; > -#elif defined(__BIG_ENDIAN_BITFIELD) > - __u8 version:4, > - ihl:4; > -#endif > - __u8 tos; > - __u16 tot_len; > - __u16 id; > - __u16 frag_off; > - __u8 ttl; > - __u8 protocol; > - __u16 check; > - __u32 saddr; > - __u32 daddr; > - /*The options start here. */ > -}; > - > -#endif /* _LINUX_IP_H */ > diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/r8188eu/os_dep/xmit_linux.c > index 60e0eea7ad84..80546a886c0e 100644 > --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c > +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c > @@ -6,7 +6,6 @@ > #include "../include/osdep_service.h" > #include "../include/drv_types.h" > #include "../include/if_ether.h" > -#include "../include/ip.h" > #include "../include/wifi.h" > #include "../include/mlme_osdep.h" > #include "../include/xmit_osdep.h" > This patch is outdated now. regards, Michael