diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-17 09:41:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-17 09:41:41 +0200 |
| commit | 927d2c21f2e82b93c791799c8da932a9bdffb436 (patch) | |
| tree | aec52fd2d3903751d696e809628d155c825ac730 /drivers/net/ethernet/netronome/nfp/flower/cmsg.c | |
| parent | cf31b7dd51b542f9a9b2d0de416b5524dfdb1cf2 (diff) | |
| parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) | |
| download | linux-927d2c21f2e82b93c791799c8da932a9bdffb436.tar.bz2 | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/flower/cmsg.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c index dd7fa9cf225f..b0837b58c3a1 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.c +++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.c @@ -115,14 +115,10 @@ nfp_flower_cmsg_portmod_rx(struct nfp_app *app, struct sk_buff *skb) return; } - if (link) { + if (link) netif_carrier_on(netdev); - rtnl_lock(); - dev_set_mtu(netdev, be16_to_cpu(msg->mtu)); - rtnl_unlock(); - } else { + else netif_carrier_off(netdev); - } rcu_read_unlock(); } |