From patchwork Tue Dec 19 23:35:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 851118 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="a6HmMHK4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z1Z6R1nXSz9s7m for ; Wed, 20 Dec 2017 10:36:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753882AbdLSXgL (ORCPT ); Tue, 19 Dec 2017 18:36:11 -0500 Received: from aserp2120.oracle.com ([141.146.126.78]:39472 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753396AbdLSXgD (ORCPT ); Tue, 19 Dec 2017 18:36:03 -0500 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBJNZjAI007071; Tue, 19 Dec 2017 23:36:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=6pR/OGgtNoVaUNx02jYLFBWs7lZBdCTTlAE7s0W/6Ko=; b=a6HmMHK4CiJscBJO4pvGz8Wt/Q7dks6N1v7vdlbYFqgEY+hyrQXsD+Mbtn/PTUcKxc+i GU0E7KdJRv7oYxAWt42K6v+ZAKgk+0uBSrTrwRqpR6StLBCrdyy+wf4tsQssGtt6QgQo OAI3tk4aCoVadwbo5fJS5+06qUzmDx0fYwQR0E+mN9V0LhpVUjreok5QhnA1CPnPsi6Y Wq/oXRFNCdazKpQM4xjHZXtfMGDhWHhxBnUHiwZnl6ZC7Xqx1SttrwSN/biw9OANuu+X V5CDmJrV4a8Fn7IdKBcDh9/N4rgF+DHfcyM1cIYoZkChWcmbq0ku8chGL6E+K/627R63 Pg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp2120.oracle.com with ESMTP id 2eycjpg0hr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Dec 2017 23:36:01 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vBJNa08T016214 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 19 Dec 2017 23:36:00 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id vBJNa0tP028647; Tue, 19 Dec 2017 23:36:00 GMT Received: from slnelson-mint18.us.oracle.com (/10.159.142.109) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 19 Dec 2017 15:35:59 -0800 From: Shannon Nelson To: steffen.klassert@secunet.com Cc: netdev@vger.kernel.org Subject: [PATCH v3 ipsec-next 3/3] xfrm: wrap xfrmdev_ops with offload config Date: Tue, 19 Dec 2017 15:35:49 -0800 Message-Id: <1513726549-7065-4-git-send-email-shannon.nelson@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513726549-7065-1-git-send-email-shannon.nelson@oracle.com> References: <1513726549-7065-1-git-send-email-shannon.nelson@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8750 signatures=668650 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=887 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712190331 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There's no reason to define netdev->xfrmdev_ops if the offload facility is not CONFIG'd in. Signed-off-by: Shannon Nelson --- include/linux/netdevice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 2eaac7d..145d0de 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1697,7 +1697,7 @@ struct net_device { const struct ndisc_ops *ndisc_ops; #endif -#ifdef CONFIG_XFRM +#ifdef CONFIG_XFRM_OFFLOAD const struct xfrmdev_ops *xfrmdev_ops; #endif