diff options
| author | Jakub Kicinski <[email protected]> | 2023-04-20 23:27:33 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2023-04-20 23:29:51 +0000 |
| commit | 681c5b51dc6b8ff1ec05555243eccf64a08cb2fd (patch) | |
| tree | 713e0523bc617cbda9ff930568dd2341907b87b8 /drivers/infiniband/hw/erdma/erdma_main.c | |
| parent | net: libwx: fix memory leak in wx_setup_rx_resources (diff) | |
| parent | wifi: ath9k: Don't mark channelmap stack variable read-only in ath9k_mci_upda... (diff) | |
| download | kernel-681c5b51dc6b8ff1ec05555243eccf64a08cb2fd.tar.gz kernel-681c5b51dc6b8ff1ec05555243eccf64a08cb2fd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Adjacent changes:
net/mptcp/protocol.h
63740448a32e ("mptcp: fix accept vs worker race")
2a6a870e44dd ("mptcp: stops worker on unaccepted sockets at listener close")
ddb1a072f858 ("mptcp: move first subflow allocation at mpc access time")
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/infiniband/hw/erdma/erdma_main.c')
| -rw-r--r-- | drivers/infiniband/hw/erdma/erdma_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/erdma/erdma_main.c b/drivers/infiniband/hw/erdma/erdma_main.c index 5dc31e5df5cb..4a29a53a6652 100644 --- a/drivers/infiniband/hw/erdma/erdma_main.c +++ b/drivers/infiniband/hw/erdma/erdma_main.c @@ -56,7 +56,7 @@ done: static int erdma_enum_and_get_netdev(struct erdma_dev *dev) { struct net_device *netdev; - int ret = -ENODEV; + int ret = -EPROBE_DEFER; /* Already binded to a net_device, so we skip. */ if (dev->netdev) |