summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorAntoine Tenart <antoine.tenart@bootlin.com>2020-05-06 16:58:30 +0300
committerDavid S. Miller <davem@davemloft.net>2020-05-07 00:34:38 +0300
commit29ca3cdfe13b2792b8624e6f769777e8cb387f9c (patch)
treedad89c90cf9a6cab6b2243e9566dcc55964c3738 /drivers/net
parent722c0f00d4feea77475a5dc943b53d60824a1e4e (diff)
downloadlinux-29ca3cdfe13b2792b8624e6f769777e8cb387f9c.tar.xz
net: macsec: fix rtnl locking issue
netdev_update_features() must be called with the rtnl lock taken. Not doing so triggers a warning, as ASSERT_RTNL() is used in __netdev_update_features(), the first function called by netdev_update_features(). Fix this. Fixes: c850240b6c41 ("net: macsec: report real_dev features when HW offloading is enabled") Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/macsec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index d4034025c87c..d0d31cb99180 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -2641,11 +2641,12 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info)
if (ret)
goto rollback;
- rtnl_unlock();
/* Force features update, since they are different for SW MACSec and
* HW offloading cases.
*/
netdev_update_features(dev);
+
+ rtnl_unlock();
return 0;
rollback: