diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-09-01 21:58:02 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-09-01 21:58:02 +0200 |
| commit | 60ad1100d525699bce83690757ff3077c6ab83ab (patch) | |
| tree | fd25eb112f4d52f4f5209bb0c83b6c36d25793ae /drivers/net/ethernet/rocker | |
| parent | net: sched: gred: remove NULL check before free table->tab in gred_destroy() (diff) | |
| parent | Merge tag 'net-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-60ad1100d525699bce83690757ff3077c6ab83ab.tar.xz linux-60ad1100d525699bce83690757ff3077c6ab83ab.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
tools/testing/selftests/net/.gitignore
sort the net-next version and use it
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/rocker')
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker_ofdpa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c index bc70c6abd6a5..58cf7cc54f40 100644 --- a/drivers/net/ethernet/rocker/rocker_ofdpa.c +++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c @@ -1273,7 +1273,7 @@ static int ofdpa_port_ipv4_neigh(struct ofdpa_port *ofdpa_port, bool removing; int err = 0; - entry = kzalloc(sizeof(*entry), GFP_KERNEL); + entry = kzalloc(sizeof(*entry), GFP_ATOMIC); if (!entry) return -ENOMEM; |