linux/drivers/net/ethernet/sun, branch v6.4

cassini: Fix a memory leak in the error handling path of cas_init_one()

2023-05-17T08:06:44Z

cas_saturn_firmware_init() allocates some memory using vmalloc(). This memory is freed in the .remove() function but not it the error handling path of the probe. Add the missing vfree() to avoid a memory leak, should an error occur. Fixes: fcaa40669cd7 ("cassini: use request_firmware") Signed-off-by: Christophe JAILLET Reviewed-by: Pavan Chebbi Reviewed-by: Simon Horman Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2023-04-13T23:04:28Z

Conflicts: tools/testing/selftests/net/config 62199e3f1658 ("selftests: net: Add VXLAN MDB test") 3a0385be133e ("selftests: add the missing CONFIG_IP_SCTP in net config") Signed-off-by: Jakub Kicinski

niu: Fix missing unwind goto in niu_alloc_channels()

2023-04-07T07:17:54Z

Smatch reports: drivers/net/ethernet/sun/niu.c:4525 niu_alloc_channels() warn: missing unwind goto? If niu_rbr_fill() fails, then we are directly returning 'err' without freeing the channels. Fix this by changing direct return to a goto 'out_err'. Fixes: a3138df9f20e ("[NIU]: Add Sun Neptune ethernet driver.") Signed-off-by: Harshit Mogalapalli Reviewed-by: Simon Horman Signed-off-by: David S. Miller

net: sunhme: move asm includes to below linux includes

2023-04-07T02:00:41Z

A recent rearrangement of includes has lead to a problem on m68k as flagged by the kernel test robot. Resolve this by moving the block asm includes to below linux includes. A side effect i that non-Sparc asm includes are now immediately before Sparc asm includes, which seems nice. Using sparse v0.6.4 I was able to reproduce this problem as follows using the config provided by the kernel test robot: $ wget https://download.01.org/0day-ci/archive/20230404/202304041748.0sQc4K4l-lkp@intel.com/config $ cp config .config $ make ARCH=m68k oldconfig $ make ARCH=m68k C=2 M=drivers/net/ethernet/sun CC [M] drivers/net/ethernet/sun/sunhme.o In file included from drivers/net/ethernet/sun/sunhme.c:19: ./arch/m68k/include/asm/irq.h:78:11: error: expected ‘;’ before ‘void’ 78 | asmlinkage void do_IRQ(int irq, struct pt_regs *regs); | ^~~~~ | ; ./arch/m68k/include/asm/irq.h:78:40: warning: ‘struct pt_regs’ declared inside parameter list will not be visible outside of this definition or declaration 78 | asmlinkage void do_IRQ(int irq, struct pt_regs *regs); | ^~~~~~~ Compile tested only. Fixes: 1ff4f42aef60 ("net: sunhme: Alphabetize includes") Reported-by: kernel test robot Link: https://lore.kernel.org/oe-kbuild-all/202304041748.0sQc4K4l-lkp@intel.com/ Signed-off-by: Simon Horman Link: https://lore.kernel.org/r/20230405-sunhme-includes-fix-v1-1-bf17cc5de20d@kernel.org Signed-off-by: Jakub Kicinski

net: sunhme: Consolidate common probe tasks

2023-03-27T07:41:56Z

Most of the second half of the PCI/SBUS probe functions are the same. Consolidate them into a common function. Signed-off-by: Sean Anderson Reviewed-by: Simon Horman Signed-off-by: David S. Miller

net: sunhme: Inline error returns

2023-03-27T07:41:56Z

The err_out label used to have cleanup. Now that it just returns, inline it everywhere. Signed-off-by: Sean Anderson Reviewed-by: Simon Horman Reviewed-by: Simon Horman Signed-off-by: David S. Miller

net: sunhme: Clean up mac address init

2023-03-27T07:41:56Z

Clean up some oddities suggested during review. Signed-off-by: Sean Anderson Reviewed-by: Simon Horman Signed-off-by: David S. Miller

net: sunhme: Consolidate mac address initialization

2023-03-27T07:41:56Z

The mac address initialization is braodly the same between PCI and SBUS, and one was clearly copied from the other. Consolidate them. We still have to have some ifdefs because pci_(un)map_rom is only implemented for PCI, and idprom is only implemented for SPARC. Signed-off-by: Sean Anderson Reviewed-by: Simon Horman Signed-off-by: David S. Miller

net: sunhme: Switch SBUS to devres

2023-03-27T07:41:56Z

The PCI half of this driver was converted in commit 914d9b2711dd ("sunhme: switch to devres"). Do the same for the SBUS half. Signed-off-by: Sean Anderson Reviewed-by: Simon Horman Signed-off-by: David S. Miller

net: sunhme: Alphabetize includes

2023-03-27T07:41:56Z

Alphabetize includes to make it clearer where to add new ones. Signed-off-by: Sean Anderson Reviewed-by: Simon Horman Signed-off-by: David S. Miller