[PATCH v2 ipsec-next 2/3] xfrm: check for xdo_dev_ops add and delete
flat view
STALE3236d
SUPERSEDED
From: Shannon Nelson <hidden>
Date: 2017-12-14 21:01:28
Subsystem:
networking [general], networking [ipsec], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Steffen Klassert, Herbert Xu, Linus Torvalds
Status: Superseded by v3 (posted 2017-12-19). [go to v3]
Revision v2 (2 revisions archived).
Revisions (2)
- v2 current
- v3 [diff against previous]
This adds a check for the required add and delete functions up front at registration time to be sure both are defined. Signed-off-by: Shannon Nelson <redacted> --- net/xfrm/xfrm_device.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c
index 30e5746..5eb6b82 100644
--- a/net/xfrm/xfrm_device.c
+++ b/net/xfrm/xfrm_device.c@@ -144,11 +144,19 @@ EXPORT_SYMBOL_GPL(xfrm_dev_offload_ok); static int xfrm_dev_register(struct net_device *dev) { - if ((dev->features & NETIF_F_HW_ESP) && !dev->xfrmdev_ops) - return NOTIFY_BAD; - if ((dev->features & NETIF_F_HW_ESP_TX_CSUM) && - !(dev->features & NETIF_F_HW_ESP)) + if (!(dev->features & NETIF_F_HW_ESP)) { + if (dev->features & NETIF_F_HW_ESP_TX_CSUM) + return NOTIFY_BAD; + else + return NOTIFY_DONE; + } + +#ifdef CONFIG_XFRM_OFFLOAD + if (!(dev->xfrmdev_ops && + dev->xfrmdev_ops->xdo_dev_state_add && + dev->xfrmdev_ops->xdo_dev_state_delete)) return NOTIFY_BAD; +#endif return NOTIFY_DONE; }
--
2.7.4