Commit 0b86235d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'udp_tunnel_nic-post-conversion-cleanup' 

udp_tunnel_nic: post conversion cleanup

It has been two releases since we added the common infra for UDP
tunnel port offload, and we have not heard of any major issues.
Remove the old direct driver NDOs completely, and perform minor
simplifications in the tunnel drivers.

Link: https://lore.kernel.org/r/20210106210637.1839662-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ddb4d32e b9ef3fec

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+0 −2
Original line number Diff line number Diff line
@@ -2295,8 +2295,6 @@ static const struct net_device_ops xgbe_netdev_ops = { 
	.ndo_setup_tc		= xgbe_setup_tc,

	.ndo_fix_features	= xgbe_fix_features,

	.ndo_set_features	= xgbe_set_features,

	.ndo_udp_tunnel_add	= udp_tunnel_nic_add_port,

	.ndo_udp_tunnel_del	= udp_tunnel_nic_del_port,

	.ndo_features_check	= xgbe_features_check,

};

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

+0 −2
Original line number Diff line number Diff line
@@ -13071,8 +13071,6 @@ static const struct net_device_ops bnx2x_netdev_ops = { 
	.ndo_get_phys_port_id	= bnx2x_get_phys_port_id,

	.ndo_set_vf_link_state	= bnx2x_set_vf_link_state,

	.ndo_features_check	= bnx2x_features_check,

	.ndo_udp_tunnel_add	= udp_tunnel_nic_add_port,

	.ndo_udp_tunnel_del	= udp_tunnel_nic_del_port,

};



static int bnx2x_set_coherency_mask(struct bnx2x *bp)

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+0 −2
Original line number Diff line number Diff line
@@ -12091,8 +12091,6 @@ static const struct net_device_ops bnxt_netdev_ops = { 
#ifdef CONFIG_RFS_ACCEL

	.ndo_rx_flow_steer	= bnxt_rx_flow_steer,

#endif

	.ndo_udp_tunnel_add	= udp_tunnel_nic_add_port,

	.ndo_udp_tunnel_del	= udp_tunnel_nic_del_port,

	.ndo_bpf		= bnxt_xdp,

	.ndo_xdp_xmit		= bnxt_xdp_xmit,

	.ndo_bridge_getlink	= bnxt_bridge_getlink,

drivers/net/ethernet/cavium/liquidio/lio_main.c

+0 −2
Original line number Diff line number Diff line
@@ -3219,8 +3219,6 @@ static const struct net_device_ops lionetdevops = { 
	.ndo_do_ioctl		= liquidio_ioctl,

	.ndo_fix_features	= liquidio_fix_features,

	.ndo_set_features	= liquidio_set_features,

	.ndo_udp_tunnel_add	= udp_tunnel_nic_add_port,

	.ndo_udp_tunnel_del	= udp_tunnel_nic_del_port,

	.ndo_set_vf_mac		= liquidio_set_vf_mac,

	.ndo_set_vf_vlan	= liquidio_set_vf_vlan,

	.ndo_get_vf_config	= liquidio_get_vf_config,

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+0 −2
Original line number Diff line number Diff line
@@ -1879,8 +1879,6 @@ static const struct net_device_ops lionetdevops = { 
	.ndo_do_ioctl		= liquidio_ioctl,

	.ndo_fix_features	= liquidio_fix_features,

	.ndo_set_features	= liquidio_set_features,

	.ndo_udp_tunnel_add	= udp_tunnel_nic_add_port,

	.ndo_udp_tunnel_del	= udp_tunnel_nic_del_port,

};



static int lio_nic_info(struct octeon_recv_info *recv_info, void *buf)