From patchwork Sat Apr 18 21:07:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 221040 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=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, 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 CE217C3A5A0 for ; Sat, 18 Apr 2020 21:11:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8D492223D for ; Sat, 18 Apr 2020 21:11:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g+aJ3lMS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728213AbgDRVLr (ORCPT ); Sat, 18 Apr 2020 17:11:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726014AbgDRVLq (ORCPT ); Sat, 18 Apr 2020 17:11:46 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38C41C061A0C for ; Sat, 18 Apr 2020 14:11:46 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id j2so7244631wrs.9 for ; Sat, 18 Apr 2020 14:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=cox5DtRmgKiterZaFcKYqvfuGiXPaz9CXT61oFEKnRo=; b=g+aJ3lMSQjVSpu3Pu0xTyRZEIhZL8bHsMRFplsmXqYXMctnTEbK6wOFN/y8cbJ66Zb aX97Nwe1WEnCGlV8d9SQiTFRcQcN6esTEktPb9z2hZA+2Xxm0f79SB9GiC7VzsW5FhAa O9nHLnKTE1K0woWwI3M95u1HRkdVoOjQknsaUbRDp27lEqkYz9hc1PKwpsxzcaWSekKv u+Q9iB3SwHQKN9zZr01tODml6vAEPqbekima8djdknr9n0mDM9ZlHqtYa86j3LNocM21 7Jfc+/wZPTZisU28wauJ31bG4wutzzY9x0Qn6FYNyG2AjtcSS8HfND3KSGT8e4ay/noq Fvfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=cox5DtRmgKiterZaFcKYqvfuGiXPaz9CXT61oFEKnRo=; b=j6+RTd8q+VtHXiXS0f68BNqRlsED71zBGEPtdXP3pPfryPw1VAgmtstJc08VgacZgz 6A8OnUWhNmbqwFWkh4E+0+xcUnis2rfXuN8e0mUk6gPnzKEVwrsX30J7eIj3hVffzGT/ cRxy0TFQI9teuWMO+z3gF9q6HCXssPaC12wbv+3FuncvvgqWrOUSQsfFlZKFZ34WchU0 sHaj5fuFZte4v6BV1LP9CYvjP06JX4RKIgJF5I0m7NXi6mBUi/Pbu7sJFAIvBXoBWfoL 11yAkUE/3jyZCxnNGnrjJfCy+d65jH41pFOQnip9nBVIiR8RY5MSSQkVQuCSm6LNxxP7 8vVA== X-Gm-Message-State: AGi0PuYwl+QoVPTj4MdXGdS06Yhrv8tRwZTLs5fGsySHg7YSO7xOn1Wt /hvcG/9OPP4m7mNw/Si8K+4LN1i8 X-Google-Smtp-Source: APiQypLULQVmyGsAChppl6cCQ/N9Bm7p0AWLqiGzZLBonIMh/DWiB79xO/ZQnx7G3da4Ub7OD1X4rQ== X-Received: by 2002:adf:f704:: with SMTP id r4mr10926561wrp.5.1587244304729; Sat, 18 Apr 2020 14:11:44 -0700 (PDT) Received: from ?IPv6:2003:ea:8f29:6000:939:e10c:14c5:fe9f? (p200300EA8F2960000939E10C14C5FE9F.dip0.t-ipconnect.de. [2003:ea:8f29:6000:939:e10c:14c5:fe9f]) by smtp.googlemail.com with ESMTPSA id f23sm12432933wml.4.2020.04.18.14.11.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 18 Apr 2020 14:11:44 -0700 (PDT) Subject: [PATCH net-next 2/6] r8169: remove NETIF_F_HIGHDMA from vlan_features From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sat, 18 Apr 2020 23:07:41 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org NETIF_F_HIGHDMA is added to vlan_features by register_netdev(), therefore we can omit this here. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 7bb423a0e..2e4353071 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5438,8 +5438,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX; - dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO | - NETIF_F_HIGHDMA; + dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; dev->priv_flags |= IFF_LIVE_ADDR_CHANGE; tp->cp_cmd |= RxChkSum; From patchwork Sat Apr 18 21:08:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 221039 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=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, 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 E09B4C2BA19 for ; Sat, 18 Apr 2020 21:11:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B5BDB21D93 for ; Sat, 18 Apr 2020 21:11:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h5U/nQ6U" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728115AbgDRVLu (ORCPT ); Sat, 18 Apr 2020 17:11:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726014AbgDRVLr (ORCPT ); Sat, 18 Apr 2020 17:11:47 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27832C061A0C for ; Sat, 18 Apr 2020 14:11:47 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id t14so7222648wrw.12 for ; Sat, 18 Apr 2020 14:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=eoJvnCZ18FXzPLy1PF9pAf+TX6PSbIFPFpBqeJgLPU0=; b=h5U/nQ6Upnm1YsEBzqZI84DhVTx/9s4ZY9yPCuZrYZfwDKIGfaQiDjLiYoeqq5VgJG VwJmPJgmF4yCaGinNF6uM0utyy2pHSwC3GuTxyn8asYYSGxa5XbCc+rTnMc6Br0Evz4h SXEJcTolmtNx6FRynSd1YrmAuYi4yAMAHys7SP0xUbY+vGsukNttwvKyrWGZ044ioZtt aB6ueF2XM6zMtNKeqZMXjST7LY9tkkJv+ys8HfbMN3dPlGDDIyilBzhY8xkStotIMRDD YYPAoopzVC2R1hzPUkmOP5s39CKCDviacT+B2DlZ8/KTUvQrciV1FJq1dG/0b5xEEGf1 bKLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=eoJvnCZ18FXzPLy1PF9pAf+TX6PSbIFPFpBqeJgLPU0=; b=T9ZmuxtIFol76wyso4fcj/Y8W1EQVb/rC1WkYekb0/ngWXRmbAh+T710qQ4ab7HNHr yMxgri3TMuWcev1PAbuaQj3ws0APfCFGddhxAu2HEdhjvGH6iDmrqDKlezRs2HvLPGm2 gJDKt0i5AsTmOtIMIW5rX2wM3tYpigDGjhfo93KHBEVwGQV3Dzcx+xAHtB71yHwjZvT6 ysIwUjgmsImWX6qhh6FXgTyzJpTEvqem7u/7BoNAkPz2b1bS3E2oqXNdDhwKwhgawK0Q W8ivZ7CLt1U6z5PiCCSwGcN2bIuSdye7y5TgjjchrkvW1ea/q8Aiei9oPKIJCybWfmea qNFQ== X-Gm-Message-State: AGi0PubN3JG7Kw7tsGxZYgRAEcZyWW+3BqE8Dy1eWYX9rMeo/BOPGDtc zSKv0mGBSzimABJ49i9uXNyMJfnJ X-Google-Smtp-Source: APiQypLum/iC6pLbVToYcXzpdZcGjjl3X5on0kSTCg1Z6zXAQt9VKDRwnajvUjqujsAGXg2Mf+fuUg== X-Received: by 2002:adf:b344:: with SMTP id k4mr10242842wrd.76.1587244305687; Sat, 18 Apr 2020 14:11:45 -0700 (PDT) Received: from ?IPv6:2003:ea:8f29:6000:939:e10c:14c5:fe9f? (p200300EA8F2960000939E10C14C5FE9F.dip0.t-ipconnect.de. [2003:ea:8f29:6000:939:e10c:14c5:fe9f]) by smtp.googlemail.com with ESMTPSA id e15sm36539365wrt.16.2020.04.18.14.11.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 18 Apr 2020 14:11:45 -0700 (PDT) Subject: [PATCH net-next 3/6] r8169: preserve VLAN setting on RTL8125 in rtl_init_rxcfg From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: <19acd6ee-a070-1707-8b1c-e3433c3a683e@gmail.com> Date: Sat, 18 Apr 2020 23:08:43 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org So far we set RX_VLAN_8125 unconditionally, even if NETIF_F_HW_VLAN_CTAG_RX may not be set. Don't touch these bits, and let only rtl8169_set_features() control them. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 2e4353071..af10b6398 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2395,6 +2395,8 @@ static void rtl_pll_power_up(struct rtl8169_private *tp) static void rtl_init_rxcfg(struct rtl8169_private *tp) { + u32 vlan; + switch (tp->mac_version) { case RTL_GIGA_MAC_VER_02 ... RTL_GIGA_MAC_VER_06: case RTL_GIGA_MAC_VER_10 ... RTL_GIGA_MAC_VER_17: @@ -2409,8 +2411,9 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp) RTL_W32(tp, RxConfig, RX128_INT_EN | RX_MULTI_EN | RX_DMA_BURST | RX_EARLY_OFF); break; case RTL_GIGA_MAC_VER_60 ... RTL_GIGA_MAC_VER_61: - RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_VLAN_8125 | - RX_DMA_BURST); + /* VLAN flags are controlled by NETIF_F_HW_VLAN_CTAG_RX */ + vlan = RTL_R32(tp, RxConfig) & RX_VLAN_8125; + RTL_W32(tp, RxConfig, vlan | RX_FETCH_DFLT_8125 | RX_DMA_BURST); break; default: RTL_W32(tp, RxConfig, RX128_INT_EN | RX_DMA_BURST); From patchwork Sat Apr 18 21:10:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 221038 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=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, 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 D438BC2BA19 for ; Sat, 18 Apr 2020 21:11:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B417B221F7 for ; Sat, 18 Apr 2020 21:11:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="exEGxFSq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728269AbgDRVLv (ORCPT ); Sat, 18 Apr 2020 17:11:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726887AbgDRVLt (ORCPT ); Sat, 18 Apr 2020 17:11:49 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0E7AC061A0C for ; Sat, 18 Apr 2020 14:11:48 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id u127so5769913wmg.1 for ; Sat, 18 Apr 2020 14:11:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=cGy3WXZNRzpAaYYLHsrov2pyDQH/DpPaqhsPHoNPF3Y=; b=exEGxFSqsNspU7g0W48CRbX9lzDfDC9efOd4dNOCZMUPiWjTxu34s+tFD48ALbpsF0 Wda0XHPFdYfxkzS+ZeBwoZrGg4tL9OUbmphW4ur4TmiZqszdSKQzpogDrormmEqv8hY1 /XTYUW/uXAOCW/2aj17IcKqmW7HFytHzgGZpDXrwkO4aYWUyGbesktAEd/BXp7+T4+es y7i1dDu4Rpxz6TN53wQyI4T1pEecm2E3FDO8vUbaycbpWhzHTzmDLbqH+dYTTF7USZ9L qmYvudj65XWgvK0KIk8jZkGJ68YZuaoy6rCSeOeO8Z0npAq/b74iICpAKvCTWp5BDOJd 8XRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=cGy3WXZNRzpAaYYLHsrov2pyDQH/DpPaqhsPHoNPF3Y=; b=bVbW+SDpQr1Ka+s+W7FQLiXrCxwWb/HJwMf85Z33dFH9AbH2ivsVU76mTJTvLIm3d9 28VEPUO1b3zPAVaBntr/w1s2IcsgxXKWyUY3OX2BirElUu4I/KqGF1vbxfBjgGO+rX8u 9xsixQjTmlvx/+1hEHnhP+qXLJPHlT5IoHZynsEg8Gd8sGYDMCE4yMxczQ0CxXy2syQL j2XK9xaZkhDjcGQNkJQClvl6NCx4XTsGlcRIpA1Kl5AOegYRtOefrH8EeeXBtf4Lpodh s8e/oQiw/8Qhi2onMsVFtfJQOFVd94MQ3Ggetaf1NRiofDQYjA+202SdRJjEktajEjNu sK3Q== X-Gm-Message-State: AGi0PuYKN9WdIVJe38XseMKMUq7BYyHNeQzlcMwaJr3tDndgtY6VaeDB 8qSEDpP71LjyjmDHtQ9F+R6pXjHO X-Google-Smtp-Source: APiQypJ2TYnZ+61V/n8HqOeZ8yjiBqgmDa8vvphWQXpJPnrHCO9wsSpO/h+/aQzP4lO7Y6R4tJxHVg== X-Received: by 2002:a1c:bc09:: with SMTP id m9mr9355511wmf.145.1587244307516; Sat, 18 Apr 2020 14:11:47 -0700 (PDT) Received: from ?IPv6:2003:ea:8f29:6000:939:e10c:14c5:fe9f? (p200300EA8F2960000939E10C14C5FE9F.dip0.t-ipconnect.de. [2003:ea:8f29:6000:939:e10c:14c5:fe9f]) by smtp.googlemail.com with ESMTPSA id j4sm32015567wrm.85.2020.04.18.14.11.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 18 Apr 2020 14:11:47 -0700 (PDT) Subject: [PATCH net-next 5/6] r8169: improve rtl8169_tso_csum_v2 From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sat, 18 Apr 2020 23:10:44 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Simplify the code and avoid the overhead of calling vlan_get_protocol(). Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169_main.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index e4bb6f36c..c7d9325f4 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -4125,25 +4125,20 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp, struct sk_buff *skb, u32 *opts) { u32 transport_offset = (u32)skb_transport_offset(skb); - u32 mss = skb_shinfo(skb)->gso_size; + struct skb_shared_info *shinfo = skb_shinfo(skb); + u32 mss = shinfo->gso_size; if (mss) { - switch (vlan_get_protocol(skb)) { - case htons(ETH_P_IP): + if (shinfo->gso_type & SKB_GSO_TCPV4) { opts[0] |= TD1_GTSENV4; - break; - - case htons(ETH_P_IPV6): + } else if (shinfo->gso_type & SKB_GSO_TCPV6) { if (skb_cow_head(skb, 0)) return false; tcp_v6_gso_csum_prep(skb); opts[0] |= TD1_GTSENV6; - break; - - default: + } else { WARN_ON_ONCE(1); - break; } opts[0] |= transport_offset << GTTCPHO_SHIFT;