From owner-svn-src-all@freebsd.org Thu Jan 24 03:50:28 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85B1214C0864; Thu, 24 Jan 2019 03:50:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 28FD976DA7; Thu, 24 Jan 2019 03:50:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B7CF22C47; Thu, 24 Jan 2019 03:50:28 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0O3oRLC026481; Thu, 24 Jan 2019 03:50:27 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0O3oReE026480; Thu, 24 Jan 2019 03:50:27 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201901240350.x0O3oReE026480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 24 Jan 2019 03:50:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r343390 - head/sys/dev/iwm X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/sys/dev/iwm X-SVN-Commit-Revision: 343390 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 28FD976DA7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2019 03:50:28 -0000 Author: kevans Date: Thu Jan 24 03:50:27 2019 New Revision: 343390 URL: https://svnweb.freebsd.org/changeset/base/343390 Log: iwm - Remove unused TX_CMD_NEXT_FRAME_* Taken-From: Linux git b1e06c65fb69c5e3fddcd91987561e225eaa9bfa Submitted by: Augustin Cavalier (Haiku) Obtained from: DragonFlyBSD (b0c6116f364a121ab6b9d634ca1997d4167fa747) Modified: head/sys/dev/iwm/if_iwmreg.h Modified: head/sys/dev/iwm/if_iwmreg.h ============================================================================== --- head/sys/dev/iwm/if_iwmreg.h Thu Jan 24 03:50:03 2019 (r343389) +++ head/sys/dev/iwm/if_iwmreg.h Thu Jan 24 03:50:27 2019 (r343390) @@ -4283,30 +4283,7 @@ enum iwm_tx_pm_timeouts { #define IWM_TX_CMD_SEC_WEP_KEY_IDX_MSK 0xc0 #define IWM_TX_CMD_SEC_KEY128 0x08 -/* TODO: how does these values are OK with only 16 bit variable??? */ /* - * TX command next frame info - * - * bits 0:2 - security control (IWM_TX_CMD_SEC_*) - * bit 3 - immediate ACK required - * bit 4 - rate is taken from STA table - * bit 5 - frame belongs to BA stream - * bit 6 - immediate BA response expected - * bit 7 - unused - * bits 8:15 - Station ID - * bits 16:31 - rate - */ -#define IWM_TX_CMD_NEXT_FRAME_ACK_MSK (0x8) -#define IWM_TX_CMD_NEXT_FRAME_STA_RATE_MSK (0x10) -#define IWM_TX_CMD_NEXT_FRAME_BA_MSK (0x20) -#define IWM_TX_CMD_NEXT_FRAME_IMM_BA_RSP_MSK (0x40) -#define IWM_TX_CMD_NEXT_FRAME_FLAGS_MSK (0xf8) -#define IWM_TX_CMD_NEXT_FRAME_STA_ID_MSK (0xff00) -#define IWM_TX_CMD_NEXT_FRAME_STA_ID_POS (8) -#define IWM_TX_CMD_NEXT_FRAME_RATE_MSK (0xffff0000) -#define IWM_TX_CMD_NEXT_FRAME_RATE_POS (16) - -/* * TX command Frame life time in us - to be written in pm_frame_timeout */ #define IWM_TX_CMD_LIFE_TIME_INFINITE 0xFFFFFFFF @@ -4343,7 +4320,7 @@ enum iwm_tx_pm_timeouts { * @initial_rate_index: index into the rate table for initial TX attempt. * Applied if IWM_TX_CMD_FLG_STA_RATE_MSK is set, normally 0 for data frames. * @key: security key - * @next_frame_flags: IWM_TX_CMD_SEC_* and IWM_TX_CMD_NEXT_FRAME_* + * @reserved3: reserved * @life_time: frame life time (usecs??) * @dram_lsb_ptr: Physical address of scratch area in the command (try_cnt + * btkill_cnd + reserved), first 32 bits. "0" disables usage.