Commit e52f7c1d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Merge in the left-over fixes before the net-next pull-request.

Conflicts:

drivers/net/ethernet/mediatek/mtk_ppe.c
  ae3ed15d ("net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear")
  9d8cb4c0 ("net: ethernet: mtk_eth_soc: add foe_entry_size to mtk_eth_soc")
https://lore.kernel.org/all/6cb6893b-4921-a068-4c30-1109795110bb@tessares.net/

kernel/bpf/helpers.c
  8addbfc7 ("bpf: Gate dynptr API behind CAP_BPF")
  5679ff2f ("bpf: Move bpf_loop and bpf_for_each_map_elem under CAP_BPF")
  8a67f2de ("bpf: expose bpf_strtol and bpf_strtoul to all program types")
https://lore.kernel.org/all/20221003201957.13149-1-daniel@iogearbox.net/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2a4187f4 0152dfee

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3833,6 +3833,7 @@ F: kernel/bpf/dispatcher.c 
F:	kernel/bpf/trampoline.c

F:	include/linux/bpf*

F:	include/linux/filter.h

F:	include/linux/tnum.h









BPF [BTF]









M:	Martin KaFai Lau <martin.lau@linux.dev>
































drivers/isdn/mISDN/l1oip.h



+1
−0






























Original line number
Diff line number
Diff line







@@ -59,6 +59,7 @@ struct l1oip {







	int			bundle;		/* bundle channels in one frm */









	int			codec;		/* codec to use for transmis. */









	int			limit;		/* limit number of bchannels */









	bool			shutdown;	/* if card is released */



















	/* timer */









	struct timer_list	keep_tl;
































drivers/isdn/mISDN/l1oip_core.c



+7
−6






























Original line number
Diff line number
Diff line







@@ -275,7 +275,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,







	p = frame;



















	/* restart timer */









	if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ))









	if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ) && !hc->shutdown)









		mod_timer(&hc->keep_tl, jiffies + L1OIP_KEEPALIVE * HZ);









	else









		hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ;








@@ -601,7 +601,9 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len)







		goto multiframe;



















	/* restart timer */









	if (time_before(hc->timeout_tl.expires, jiffies + 5 * HZ) || !hc->timeout_on) {









	if ((time_before(hc->timeout_tl.expires, jiffies + 5 * HZ) ||









	     !hc->timeout_on) &&









	    !hc->shutdown) {









		hc->timeout_on = 1;









		mod_timer(&hc->timeout_tl, jiffies + L1OIP_TIMEOUT * HZ);









	} else /* only adjust timer */








@@ -1232,11 +1234,10 @@ release_card(struct l1oip *hc)







{









	int	ch;



















	if (timer_pending(&hc->keep_tl))









		del_timer(&hc->keep_tl);









	hc->shutdown = true;



















	if (timer_pending(&hc->timeout_tl))









		del_timer(&hc->timeout_tl);









	del_timer_sync(&hc->keep_tl);









	del_timer_sync(&hc->timeout_tl);



















	cancel_work_sync(&hc->workq);










































drivers/net/ethernet/atheros/alx/main.c



+5
−0






























Original line number
Diff line number
Diff line







@@ -1912,11 +1912,14 @@ static int alx_suspend(struct device *dev)

















	if (!netif_running(alx->dev))









		return 0;



















	rtnl_lock();









	netif_device_detach(alx->dev);



















	mutex_lock(&alx->mtx);









	__alx_stop(alx);









	mutex_unlock(&alx->mtx);









	rtnl_unlock();



















	return 0;









}








@@ -1927,6 +1930,7 @@ static int alx_resume(struct device *dev)







	struct alx_hw *hw = &alx->hw;









	int err;



















	rtnl_lock();









	mutex_lock(&alx->mtx);









	alx_reset_phy(hw);


















@@ -1943,6 +1947,7 @@ static int alx_resume(struct device *dev)

















unlock:









	mutex_unlock(&alx->mtx);









	rtnl_unlock();









	return err;









}










































drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -787,6 +787,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,







			BNX2X_ERR("skb_put is about to fail...  pad %d  len %d  rx_buf_size %d\n",









				  pad, len, fp->rx_buf_size);









			bnx2x_panic();









			bnx2x_frag_free(fp, new_data);









			return;









		}









#endif