From owner-freebsd-current@freebsd.org Sun Jul 26 02:13:40 2020 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 84B52378CA9 for ; Sun, 26 Jul 2020 02:13:40 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-21.consmr.mail.gq1.yahoo.com (sonic306-21.consmr.mail.gq1.yahoo.com [98.137.68.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BDmh32rRwz3yJy for ; Sun, 26 Jul 2020 02:13:39 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-YMail-OSG: zMFFrvAVM1nGIC_ynC2u_LuYdx2_3cjahbI4fxfvrBZ9M5c9FQ4DaX9MJQLStRI eAs.Y.stQOG8Y5RC_qhjYsod6AUluLsmHjX1pcUBja11h_tnWfaUOEQ7V6nENNUty2oG4Qfa7.j_ wQR0XRxAhSjT1p5l7xMkslAMcIYHUe9gdmCpRkRBQKfqQoq19oQWrc76qpBrdcUhm9Ay.EtFV49T dYl8ePt7ziIRo6difqalgvFj1XLW.huPmMvMG1cwXHMeyvMxJoWKFfcarmMxkPXrCAW1CWB1geiW WuRPNi20eWg1LPeSg_1a5oQx4N9TH00KkbPNTKHz4lh2HbjfPT6nQEV7aQavEI.RB0PzzjAoBVfq cy2r3cllhU_4bIcybgIlMCQ8_qNML1YVP1OcHekP5kQC3OLu_6eArZnGc23hkxWx0rlMywW8lGL5 1QuL4Mc3KbCx68a8LwOiz3IKpf6NnGOS.U3.RGHO_Dh4n7yJfiMOiEbu8YEnlRSgVo4EZHaKDJyy 6j8Z2XocGqIFuwiadbxQpxoyjWu1xNWi.qKje8S8BjsqICVCWOlw8Z0qHrLMy8.4TnORaF3WHX4u jVSEMvSnFiKoVUuuf_od1LXY4Ualhak_AbBEuLiyDoVNPyT74jsD9dgSaqNBfbKUr_cJwcD5Rvdv zBscOpEa5NR0zlTy_MzDYeStXvVTGUCHANe_I0Vpnl_vir7r24a5GHjjJtwwBDYyeVYZcjllFvMj mNEPnqtmUAqKeyy0wNz20Cuxkg6D4_vaOe0oiL4BR0DnScyQG7eZ_TKSIc76a4Vz1gXLP_ha69H_ NQSdn_rlW3Cbc.LxITavs4x4T0Mx0sd_punySvKyJrWqi4C.vk_dHQPdeRS8GcDBrfRwht.pHdd4 GC6G78AFpI5DWQC_yQIWRBaFMuixBAZCkbB2srVUTI7zXdYpuxzQH9jIVmpFvT2VSVsKa8l_XdZp ZAl.pmygE2Y7484.i_eX5Zp8rPeqXp6D9NlmN.hGiFls7l8j9mTagE58WJwTiGglH35yy__jImQT 5xi._K8kg_BHK7xOEDXUYbTkkdnIgNBMSJVi4TQB5BWuNyQqUrrb3JqzUJDp2dZzqYJPNNVjbHq6 GWExE0aPJAChokDiVSSjZ6YD6min2BIvTtvniAGW9EzW0FqFBoIaVOvTXX2I7o1ycVxByTB1S6Dn yEWz6cG8sHY0gD62QeZK4egNYs8toonORIuVV9OwJez6LrWdNkjTVd70OjYIwb1PgDNz4BP7Oy6h YDL0an.8xq5l37MCWwOEnmzPKyhUhiMUzCRjruT1cE21mi4OrcHFviIBpir1oo2fP08pR0DCqZyK B1CnGtLyvljYwxtNTTBBAqoNi_mjZcqNRFanyIAYOEuFuNavETpzwZLpiOQxu_tSN85iMYRH8bpa B0KBAd1MncehBWA4G2SY3Ctf3MOc- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Sun, 26 Jul 2020 02:13:37 +0000 Received: by smtp425.mail.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 17fc2139196e746ab4dd9c3b44636f67; Sun, 26 Jul 2020 02:13:34 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.80.23.2.2\)) Subject: Re: CFT: major update to if_ure (patch did not apply cleanly for head -r363510) Message-Id: Date: Sat, 25 Jul 2020 19:13:33 -0700 To: John-Mark Gurney , FreeBSD Current X-Mailer: Apple Mail (2.3608.80.23.2.2) References: X-Rspamd-Queue-Id: 4BDmh32rRwz3yJy X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.68 / 15.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.84:from]; FROM_HAS_DN(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; NEURAL_HAM_LONG(-1.04)[-1.039]; NEURAL_HAM_MEDIUM(-1.01)[-1.007]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.84:from]; NEURAL_HAM_SHORT(-0.14)[-0.138]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/21, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jul 2020 02:13:40 -0000 For reference for what applying the patch reported (see Hunk #14): # patch < D25809.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/dev/usb/net/if_ure.c |=================================================================== |--- sys/dev/usb/net/if_ure.c |+++ sys/dev/usb/net/if_ure.c -------------------------- Patching file sys/dev/usb/net/if_ure.c using Plan A... Hunk #1 succeeded at 43. Hunk #2 succeeded at 64. Hunk #3 succeeded at 75. Hunk #4 succeeded at 149. Hunk #5 succeeded at 503. Hunk #6 succeeded at 561. Hunk #7 succeeded at 607. Hunk #8 succeeded at 658. Hunk #9 succeeded at 764. Hunk #10 succeeded at 880. Hunk #11 succeeded at 935. Hunk #12 succeeded at 977. Hunk #13 succeeded at 1007. Hunk #14 failed at 1033. Hunk #15 succeeded at 1057. Hunk #16 succeeded at 1071. Hunk #17 succeeded at 1153. Hunk #18 succeeded at 1250. Hunk #19 succeeded at 1282. Hunk #20 succeeded at 1340 with fuzz 2. Hunk #21 succeeded at 1492. Hunk #22 succeeded at 1519. Hunk #23 succeeded at 1652. 1 out of 23 hunks failed--saving rejects to sys/dev/usb/net/if_ure.c.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/dev/usb/net/if_urereg.h |=================================================================== |--- sys/dev/usb/net/if_urereg.h |+++ sys/dev/usb/net/if_urereg.h -------------------------- Patching file sys/dev/usb/net/if_urereg.h using Plan A... Hunk #1 succeeded at 391. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/modules/usb/ure/Makefile |=================================================================== |--- sys/modules/usb/ure/Makefile |+++ sys/modules/usb/ure/Makefile -------------------------- Patching file sys/modules/usb/ure/Makefile using Plan A... Hunk #1 succeeded at 5. done As for the .rej file content: # more sys/dev/usb/net/if_ure.c.rej @@ -752,6 +1033,18 @@ ure_read_2(sc, URE_PLA_FMC, URE_MCU_TYPE_PLA) | URE_FMC_FCR_MCU_EN); + /* Enable RX VLANs if enabled */ + cpcr = ure_read_2(sc, URE_PLA_CPCR, URE_MCU_TYPE_PLA); + if (if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) { + DEVPRINTFN(13, sc->sc_ue.ue_dev, "enabled hw vlan tag\n"); + cpcr |= URE_CPCR_RX_VLAN; + } else { + DEVPRINTFN(13, sc->sc_ue.ue_dev, "disabled hw vlan tag\n"); + cpcr &= ~URE_CPCR_RX_VLAN; + } + ure_write_2(sc, URE_PLA_CPCR, URE_MCU_TYPE_PLA, + cpcr); + /* Enable transmit and receive. */ ure_write_1(sc, URE_PLA_CR, URE_MCU_TYPE_PLA, ure_read_1(sc, URE_PLA_CR, URE_MCU_TYPE_PLA) | URE_CR_RE | === Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)