diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2020-08-31 12:28:12 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2020-08-31 12:28:12 -0300 |
| commit | 6989aa62d342d79d447a9af12477b907d211bebe (patch) | |
| tree | 09722ffca5dea6933dec72691f89a8cb09f78656 /drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | |
| parent | RDMA/rxe: Address an issue with hardened user copy (diff) | |
| parent | Linux 5.9-rc3 (diff) | |
| download | linux-dev-6989aa62d342d79d447a9af12477b907d211bebe.tar.xz linux-dev-6989aa62d342d79d447a9af12477b907d211bebe.zip | |
Merge tag 'v5.9-rc3' into rdma.git for-next
Required due to dependencies in following patches.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/net/ethernet/toshiba/ps3_gelic_wireless.c')
| -rw-r--r-- | drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c index 2db546b27ee0..dc14a66583ff 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c @@ -877,7 +877,7 @@ static int gelic_wl_set_auth(struct net_device *netdev, case IW_AUTH_KEY_MGMT: if (param->value & IW_AUTH_KEY_MGMT_PSK) break; - /* intentionally fall through */ + fallthrough; default: ret = -EOPNOTSUPP; break; |