From patchwork Thu Dec 14 21:01:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 848775 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="lfVVoPpQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yyQwT1JNQz9t3F for ; Fri, 15 Dec 2017 08:01:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753349AbdLNVBn (ORCPT ); Thu, 14 Dec 2017 16:01:43 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:34251 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752718AbdLNVB2 (ORCPT ); Thu, 14 Dec 2017 16:01:28 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vBEKvAui093265; Thu, 14 Dec 2017 21:01:26 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=lfVVoPpQqk05lnaXkWXnNZ6VpDy/jMnTmFx6jsE5/5bvj1YS4n+lNDdPznxQLsElbIor hDiUts7ViL93vh9GQWUgcDdRyxY8n5tfSYkqQRf/D1isgROZdcfTI+WKrNC8TZSuHDH6 ACWGvClMKYK0gwem3K83NZzJ1bVTV/xuKcfzOhiyTIq+ycJ3GGUEj31exrlMqSARmvTP WlVqMjciR5B/lj3ntq46qSrR49zt+AjRPTsnSZkEOiu6ZAg+nmBPILwD+5Xr76al4oaY RvVRjauf22yuICKjbQwX9SOQaE4Erkv8GWmuXx/zUoB3U84YsXWL/jx30SOm6W5wssU7 wA== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2130.oracle.com with ESMTP id 2ev0par2y0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Dec 2017 21:01:26 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id vBEL1Pxb031447 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Dec 2017 21:01:25 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id vBEL1OOl032138; Thu, 14 Dec 2017 21:01:25 GMT Received: from slnelson-mint18.us.oracle.com (/10.159.251.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 14 Dec 2017 13:01:24 -0800 From: Shannon Nelson To: steffen.klassert@secunet.com Cc: netdev@vger.kernel.org Subject: [PATCH v2 ipsec-next 3/3] xfrm: wrap xfrmdev_ops with offload config Date: Thu, 14 Dec 2017 13:01:17 -0800 Message-Id: <1513285277-21092-4-git-send-email-shannon.nelson@oracle.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513285277-21092-1-git-send-email-shannon.nelson@oracle.com> References: <1513285277-21092-1-git-send-email-shannon.nelson@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8745 signatures=668648 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=891 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712140288 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