From patchwork Tue Sep 20 22:00:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 672485 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sdxXF0yq1z9sdg for ; Wed, 21 Sep 2016 08:00:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755040AbcITWAn (ORCPT ); Tue, 20 Sep 2016 18:00:43 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:55377 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754971AbcITWAh (ORCPT ); Tue, 20 Sep 2016 18:00:37 -0400 Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u8KM0Yjg005520 for ; Tue, 20 Sep 2016 15:00:36 -0700 Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 25ka6gsj0p-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Tue, 20 Sep 2016 15:00:36 -0700 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB09.TheFacebook.com (192.168.16.19) with Microsoft SMTP Server (TLS) id 14.3.294.0; Tue, 20 Sep 2016 15:00:34 -0700 Received: from facebook.com (2401:db00:21:6030:face:0:92:0) by mx-out.facebook.com (10.103.99.97) with ESMTP id a8337cfe7f7d11e6acc50002c9931860-42ee8a50 for ; Tue, 20 Sep 2016 15:00:35 -0700 Received: by devvm855.prn2.facebook.com (Postfix, from userid 12345) id 0B9163E14FB; Tue, 20 Sep 2016 15:00:35 -0700 (PDT) From: Tom Herbert To: , CC: , , , , , Subject: [PATCH RFC 3/3] netdevice: Remove obsolete xdp_netdev_command Date: Tue, 20 Sep 2016 15:00:24 -0700 Message-ID: <1474408824-418864-4-git-send-email-tom@herbertland.com> X-Mailer: git-send-email 2.8.0.rc2 In-Reply-To: <1474408824-418864-1-git-send-email-tom@herbertland.com> References: <1474408824-418864-1-git-send-email-tom@herbertland.com> X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-09-20_08:, , signatures=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove XDP_SETUP_PROG and XDP_QUERY_PROG as they should no longer be needed. Signed-off-by: Tom Herbert --- include/linux/netdevice.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f2b7d1b..9a545ab 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -808,18 +808,6 @@ struct tc_to_netdev { * to the netdevice through the xdp op. */ enum xdp_netdev_command { - /* Set or clear a bpf program used in the earliest stages of packet - * rx. The prog will have been loaded as BPF_PROG_TYPE_XDP. The callee - * is responsible for calling bpf_prog_put on any old progs that are - * stored. In case of error, the callee need not release the new prog - * reference, but on success it takes ownership and must bpf_prog_put - * when it is no longer used. - */ - XDP_SETUP_PROG, - /* Check if a bpf program is set on the device. The callee should - * return true if a program is currently attached and running. - */ - XDP_QUERY_PROG, /* Initialize XDP in the device. Called the first time an XDP hook * hook is being set on the device. */ @@ -833,10 +821,7 @@ enum xdp_netdev_command { struct netdev_xdp { enum xdp_netdev_command command; union { - /* XDP_SETUP_PROG */ - struct bpf_prog *prog; - /* XDP_QUERY_PROG */ - bool prog_attached; + /* Command parameters */ }; };