Message ID | 20220319074240.554227-2-steffen.klassert@secunet.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 2ecda181682e9ed66dfbd5f8445c5d5a35b984d3 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [1/2] xfrm: delete duplicated functions that calls same xfrm_api_check() | expand |
Hello: This series was applied to netdev/net-next.git (master) by Steffen Klassert <steffen.klassert@secunet.com>: On Sat, 19 Mar 2022 08:42:39 +0100 you wrote: > From: Leon Romanovsky <leonro@nvidia.com> > > The xfrm_dev_register() and xfrm_dev_feat_change() have same > implementation of one call to xfrm_api_check(). Instead of doing such > indirection, call to xfrm_api_check() directly and delete duplicated > functions. > > [...] Here is the summary with links: - [1/2] xfrm: delete duplicated functions that calls same xfrm_api_check() https://git.kernel.org/netdev/net-next/c/2ecda181682e - [2/2] xfrm: rework default policy structure https://git.kernel.org/netdev/net-next/c/b58b1f563ab7 You are awesome, thank you!
diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c index 3fa066419d37..36d6c1835844 100644 --- a/net/xfrm/xfrm_device.c +++ b/net/xfrm/xfrm_device.c @@ -380,16 +380,6 @@ static int xfrm_api_check(struct net_device *dev) return NOTIFY_DONE; } -static int xfrm_dev_register(struct net_device *dev) -{ - return xfrm_api_check(dev); -} - -static int xfrm_dev_feat_change(struct net_device *dev) -{ - return xfrm_api_check(dev); -} - static int xfrm_dev_down(struct net_device *dev) { if (dev->features & NETIF_F_HW_ESP) @@ -404,10 +394,10 @@ static int xfrm_dev_event(struct notifier_block *this, unsigned long event, void switch (event) { case NETDEV_REGISTER: - return xfrm_dev_register(dev); + return xfrm_api_check(dev); case NETDEV_FEAT_CHANGE: - return xfrm_dev_feat_change(dev); + return xfrm_api_check(dev); case NETDEV_DOWN: case NETDEV_UNREGISTER: