[From nobody Thu Jun 25 05:54:42 2020 Received: from mail-db5eur01on060a.outbound.protection.outlook.com ([2a01:111:f400:fe02::60a] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUySc-0001B5-J2 for openwrt-devel@lists.openwrt.org; Mon, 18 Jun 2018 18:01:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kAuGeuM3VvfBIZtyPmfrc3AnYBE6BTM3PpDHref/eBI=; b=g2VYW7RkhGgxW/1lYKSVGf8MV30+fSyQneGqQo37suF8q0uhj+RWUJAlYUWxfpOiZeEE1sRA8BSOlXwb9ZMrJXBKgaPosj7s1X/U6/98Xnf0Q6ABnW5h42IJJeAZyb9ckvhu9/kZg6/BYfMCJr5FiM60MhE2GRdkLFLrmUOBgPM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Kevins-MBP.lan (90.155.95.206) by DB6PR07MB4246.eurprd07.prod.outlook.com (2603:10a6:6:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.6; Mon, 18 Jun 2018 18:00:36 +0000 From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> To: openwrt-devel@lists.openwrt.org Cc: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Subject: [RFC PATCH] ltq_atm: burn ifx_atm_alloc_tx with fire Date: Mon, 18 Jun 2018 19:00:14 +0100 Message-Id: <20180618180014.66943-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.15.2 (Apple Git-101.1) MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [90.155.95.206] X-ClientProxiedBy: LO2P265CA0088.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:8::28) To DB6PR07MB4246.eurprd07.prod.outlook.com (2603:10a6:6:51::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5868add1-ffd4-4ada-0f38-08d5d54564f3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:DB6PR07MB4246; X-Microsoft-Exchange-Diagnostics: 1; DB6PR07MB4246; 3:yBBD3k7JmUFMNcaxYUk9ZqSuNTSLXBRUVDMZzC3GrwYMtFGU2kMUmt6e9G+/vY9FK+0GQgbnaHMkLEmKuMleMtaKb4bzoWI8eZrcDn7vbmkY+zCzyrZlSpvjKt/fEnwF5ZZ0lJKcUpSoWwj5YjglGjdyLw4Zm5HpmcMI2u+NHv/mwHA82HLMeoY5g+y8NFAI2jDsvBeLJhShLLwCyj4VX5/lbZyFaHnTGku9uIdVW9eCdr+xhsoEegkdO0YrHJx5; 25:6Hbm/cABvBWK4FnV0jFrMuVevbjQm6iu06pIS3W8rYoHWaeAECaoGBmjShiFMMl/RQTu70ZQrIRF2SkAhnY5Usmg/Sf+ZHX2GNknXoTyUlrzP0fETqooU5GzhQDSKF2447xO7mkX7OSKGifLYGF6pnRgA8O6xb2E2CexhbRanJo6MwmHa27wQFWI9AnkBwxGpE8C7XGijzehv02OVDrSwaVLoHA796egPq1b3A2kAFb1DlSG2Em8sH4/BxYoiNn9XMzT+uq7AvIiIapsr9YXpNalbctL8iN7CMwL9rXtR9qBwcLrGjnqXlzOAhUpbU1zOQ7ll+10FMxnFLetWp4Grg==; 31:uQaDsmVaPWdDGrXygKjF8EBPlisVGobFygLZPrNXfczSPR1yH5WofnwtMlYetjJl8HZPD76VIf7zAT84yOyKk4P2+AP5o5sMnEsOgrp8c1GOJ93egMRKVGJZ3ws//jh42Zz01WhFYnErrEZ7ZT8d/X806lbbY1qvxgbHfI0IKPbM3rj1PyVDR9GRqTwyePw0TQlifDLiU7hIyoDPhUpdwL1l4S5KaNboGD5ZFC0a7Ys= X-MS-TrafficTypeDiagnostic: DB6PR07MB4246: X-Microsoft-Antispam-PRVS: <DB6PR07MB42463E9742440A8922A90B1AA5710@DB6PR07MB4246.eurprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123562045)(2016111802025)(20161123560045)(6043046)(6072148)(201708071742011)(7699016); SRVR:DB6PR07MB4246; BCL:0; PCL:0; RULEID:; SRVR:DB6PR07MB4246; X-Microsoft-Exchange-Diagnostics: 1; DB6PR07MB4246; 4:+stTt88Bp2nDNdOQcdOoh1KGsTMrFry3E+ZH8ujvmnFQGCYcd9UNRgi5K/tonRf+QkcEmdQjq3NOReiNtn83uIBzXKJAWn5W4XujqPH2Z44dJXc0dF2Y8xHKsfKKmO6E0oQaGgtJcvko+K2iCAWJMaaRpJVCP+4jtqP2XCmXhWTXpPlTedrUitIdSa382TtEFRW2Xt/QCLojqXmeTVZOgf48D/k+nutJdGxqYprxitR1+gnzV6DDSN+KdD6NndR7Aj62aMBKAFs4KffRpkN9Xw== X-Forefront-PRVS: 0707248B64 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(346002)(366004)(396003)(39830400003)(189003)(199004)(575784001)(66066001)(25786009)(7736002)(305945005)(107886003)(2906002)(74482002)(47776003)(16586007)(478600001)(36756003)(97736004)(6512007)(53936002)(69596002)(8676002)(316002)(4326008)(6916009)(5660300001)(6666003)(59450400001)(16526019)(2351001)(386003)(48376002)(51416003)(52116002)(6506007)(2616005)(956004)(106356001)(50226002)(186003)(2361001)(50466002)(486006)(21086003)(3846002)(8936002)(81156014)(6116002)(68736007)(476003)(81166006)(26005)(6486002)(1076002)(105586002)(169013001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR07MB4246; H:Kevins-MBP.lan; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR07MB4246; 23:WBjOyUdq7WeQ6wtMzKEYrkh65fdfGj4TBcYlVb/tB?= =?us-ascii?Q?T75uKjVsPQu4oELr5Jtei/FP8QF8aFzLFReqnJW9bRbnaScUdDRW9h9orj9Z?= =?us-ascii?Q?EJooXyqTLar7+ww6UPq6d1/SLGuPUr6KbFNJVH2D06l1qBoq58YFcZxSLqi5?= =?us-ascii?Q?Dm2cmqQP//xGdGzxP25ua0XvBi5RWKDPUHtHjHuiSTXKw815J66bOjKhoGiC?= =?us-ascii?Q?J+oeHcBo3SgtNy6iE3KtJ/OdkeM2E0vduAPuMxkJjRQkRyowdM75uf8s17wE?= =?us-ascii?Q?wrpqjxdYuGQp+43QILgBkQ8OOHgPpjcqG2woETJpZTwVNnRlr9U1KBGHOOF4?= =?us-ascii?Q?8wrAxGs0Pwk12w3FifnHSt1mfIWwD2gya2s+j7XLwZDwMJYzXLhoobACktWs?= =?us-ascii?Q?yniFJz5MwghfIUut70rYNDhUWPNqoWa3W4nz0t9qXU6PwdNHehgBmJe8p0ec?= =?us-ascii?Q?fFgFOwkU8bRncu2Vg99GYaVVyNB0G0EjpxOxXfNUjrXhr/kxbtCRZsb1ynQp?= =?us-ascii?Q?YYT5xCvH0n3mN1q48rHU/rY08YBvEFYHdAtmA9uiuVTGv9ns/0i8FaQVhdPS?= =?us-ascii?Q?wJfeMpmjDJmmS1Z3LMww8Q9Q/7m0Pm4C7fVvj10zBoLNNoFI//iEnmAlt8+B?= =?us-ascii?Q?yg/E6VPNp56jdtN9E5q0+zyOzEwf6jb8xxbYKrYOVXopztOEsL/TdrsbmaqR?= =?us-ascii?Q?9gz9gYitsPSYmZ3vwkO/e9Vc0oXhXWKwA7FuW30qS90HLuQt1LOck3QlgqwO?= =?us-ascii?Q?2Od7okH4bMfv0KRdE3reBfG4aWsm+Y55fchrxg9Q+QTnW84viMuuZ3yIsrAY?= =?us-ascii?Q?A9cEzbhxm1CZnsSIHsZ4ZE23t/AjWG+0hXiVRgGf5cHnakH2FpGqva3+XD0k?= =?us-ascii?Q?f5G/SazGrpCxgIE5PBHvzzAemo0H4Wkbxz9kfVg6H4qhHbyY33AhudWyFKxF?= =?us-ascii?Q?OEPcEeQZM26inJF12t2hslrVkWPxBFF63sfrOxTjCBiU6bwUg7I/m4OpHrOz?= =?us-ascii?Q?Fb6Pd7uwvNYix/uuXfL6q8+b7FQStj5MyExr3PYYRyzasJwjc7JM1NqzIpNR?= =?us-ascii?Q?tC9wMdQk0QtCfdv1AUSWvgj3ei/Mda+DNQs26M3MzDkCK1cqNUbLTBJThDrg?= =?us-ascii?Q?Bim7hxY/9rWifj97ePhxM1bifJ26LD71XmLoaz0P+yhFRDTk7ahtwia4ZKZi?= =?us-ascii?Q?PB70NXM95y9Ii4cw2QhBlRt7TbL5kt81TIaLgMfILi8E8li+TPXEQ7e8wnG9?= =?us-ascii?Q?S2I6Qv4fTSoOU0sNb9XF6HSdjzjVZ7VrTnf47HHM8+NsGU25zbJAD0r8oW83?= =?us-ascii?Q?DXx0jiCR4lORECbGbf7JrM=3D?= X-Microsoft-Antispam-Message-Info: XvmG/u1hvlHg1Qlb7FnTsbMmYLT+pO4he8aoRJH+nXOW3UWF2fRe4WZKc22+FyBXirWuPaAJFh09hxxx7i8uGCOKOmhGrKHNUrb/cqsUMAYD025s+C/7R2PmaASHlyWmiviY8K2ewNloF8LEr8CyNvaMLBZW3A6VmKEvHJK8yrJpurDTY4OMXIVZE18BzEi3 X-Microsoft-Exchange-Diagnostics: 1; DB6PR07MB4246; 6:p7jhRdf6lLsty3OhIKvQdZ7giwFfpYs8Tj1nIA1i0kmsds+5qEeRqii4HzYbIrkok1v0SXzt0hB/LwH6PZn9wfhkwOQcBXJuCO7PUwNr/ZeGSngep0yiNj/vGRW7xIC0v7rV2uOVYLyl6qDvs9Y9QbhqWC0xONdvfDa+rxcU8IA30Gf73Behoq/8IPBjLdUjKzbyU39fm5WOSGO/rQhBxa0gd5AsWw8b5ledSMAbXTZB1V8D+Rs0J3F4H1KsA2xdusWnWFJQQDR0yw7393ytXdtmxsK7PO9eWXl8HIJ/UQImKMH29viCXMP4RFAAA63OvokDaAVTERDH5C9BJciqwM4Om/7e1HuVh1tlD6fg7KRKSkIWxUWgGFlDa4pUNi/m2kEmluTooUzQdDBQwmsN15ixtfAJzI9vuUaZMreQQaSZbWUXS6deh6q8FujUgk8vjtN9dHzXgnP6ewvmoUxXbg==; 5:T06Rlj45sbOrDywugT3+qfW2ugyumAEPnUVgT7yfNBPTWxg34jrZEeOa457Ju6ElKsqQCvA8AHQZmUcTatPlRJZiOY03XpJDQKlQT1yw2kqKK3t9hGUntp4U5UNfo2oHfT4PU1Fr2W6asiUfV+9IKnXDugmclUdJWYyIvotnoeg=; 24:fFJF/Pw0Hr2kWMkM0mKida0Hr1AFXjf5n3Rudd2AXTuTofFTgDVr5FW2iretu+Arq2WnLT1SKdPe6iuVa7lPpsHmG4f6/YE8sXqgoxmh5Nk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR07MB4246; 7:+s8fgDbwHV9lDd2vg+veOdDwWcI+yE2x5aRzmnOHV/J96Tp7BcPWpv6dwNQoxutincpdQn8X4ewzb6Y+q39EhiU7QlmHr9ZBWyvhtswXizAk0sUxyKxLEYkpkBeJ2EshhfQfnjEFGP4hV9DnRsLlyF0h/EP82eEznls/Rne2bb6aHftxvizrnQSFJAXpQaUTbq1f/ugevrSyy7kf4wvcf9BfAGo9VZiUruRy/1vlsWf/hP8sgmhwM+7+9RggW3Ls X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2018 18:00:36.4662 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5868add1-ffd4-4ada-0f38-08d5d54564f3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR07MB4246 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180618_110102_816221_5BB299DE X-CRM114-Status: UNSURE ( 9.04 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fe02:0:0:0:60a listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Since commit 0276e1f7608a2b5252aee0c92c9834a150582ffe we no longer call or use ifx_atm_alloc_tx and the pointed to function atm_alloc_tx. Let's remove this unused code. Tested on: BT HomeHub 5a Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> --- package/kernel/lantiq/ltq-atm/src/ltq_atm.c | 45 +---------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c index a8f787fdca..b7ac81ca80 100644 --- a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c +++ b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c @@ -187,7 +187,6 @@ static inline void u64_add_u32(ppe_u64_t, unsigned int, ppe_u64_t *); */ static inline struct sk_buff* alloc_skb_rx(void); static inline struct sk_buff* alloc_skb_tx(unsigned int); -struct sk_buff* atm_alloc_tx(struct atm_vcc *, unsigned int); static inline void atm_free_tx_skb_vcc(struct sk_buff *, struct atm_vcc *); static inline struct sk_buff *get_skb_rx_pointer(unsigned int); static inline int get_tx_desc(unsigned int); @@ -261,8 +260,6 @@ EXPORT_SYMBOL(ifx_mei_atm_showtime_exit); #endif -static struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL; - static struct atm_priv_data g_atm_priv_data; static struct atmdev_ops g_ifx_atm_ops = { @@ -430,8 +427,6 @@ static int ppe_open(struct atm_vcc *vcc) /* enable irq */ if ( f_enable_irq ) { - ifx_atm_alloc_tx = atm_alloc_tx; - *MBOX_IGU1_ISRC = (1 << RX_DMA_CH_AAL) | (1 << RX_DMA_CH_OAM); *MBOX_IGU1_IER = (1 << RX_DMA_CH_AAL) | (1 << RX_DMA_CH_OAM); @@ -480,10 +475,8 @@ static void ppe_close(struct atm_vcc *vcc) clear_bit(conn, &g_atm_priv_data.conn_table); /* disable irq */ - if ( g_atm_priv_data.conn_table == 0 ) { + if ( g_atm_priv_data.conn_table == 0 ) disable_irq(PPE_MAILBOX_IGU1_INT); - ifx_atm_alloc_tx = NULL; - } /* release bandwidth */ switch ( vcc->qos.txtp.traffic_class ) @@ -785,42 +778,6 @@ static inline struct sk_buff* alloc_skb_tx(unsigned int size) return skb; } -struct sk_buff* atm_alloc_tx(struct atm_vcc *vcc, unsigned int size) -{ - int conn; - struct sk_buff *skb; - - /* oversize packet */ - if ( size > aal5s_max_packet_size ) { - pr_err("atm_alloc_tx: oversize packet\n"); - return NULL; - } - /* send buffer overflow */ - if ( sk_wmem_alloc_get(sk_atm(vcc)) && !atm_may_send(vcc, size) ) { - pr_err("atm_alloc_tx: send buffer overflow\n"); - return NULL; - } - conn = find_vcc(vcc); - if ( conn < 0 ) { - pr_err("atm_alloc_tx: unknown VCC\n"); - return NULL; - } - - skb = dev_alloc_skb(size); - if ( skb == NULL ) { - pr_err("atm_alloc_tx: sk buffer is used up\n"); - return NULL; - } - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)) - refcount_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -#else - atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -#endif - - return skb; -} - static inline void atm_free_tx_skb_vcc(struct sk_buff *skb, struct atm_vcc *vcc) { if ( vcc->pop != NULL ) -- 2.15.2 (Apple Git-101.1) ]