Commit 2106efda authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

net: remove .ndo_change_proto_down 



.ndo_change_proto_down was added seemingly to enable out-of-tree
implementations. Over 2.5yrs later we still have no real users
upstream. Hardwire the generic implementation for now, we can
revert once real users materialize. (rocker is a test vehicle,
not a user.)

We need to drop the optimization on the sysfs side, because
unlike ndos priv_flags will be changed at runtime, so we'd
need READ_ONCE/WRITE_ONCE everywhere..

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c384cee1

drivers/net/ethernet/rocker/rocker_main.c

+0 −12
Original line number Diff line number Diff line
@@ -1995,17 +1995,6 @@ static int rocker_port_get_phys_port_name(struct net_device *dev, 
	return err ? -EOPNOTSUPP : 0;

}



static int rocker_port_change_proto_down(struct net_device *dev,

					 bool proto_down)

{

	struct rocker_port *rocker_port = netdev_priv(dev);



	if (rocker_port->dev->flags & IFF_UP)

		rocker_port_set_enable(rocker_port, !proto_down);

	rocker_port->dev->proto_down = proto_down;

	return 0;

}



static void rocker_port_neigh_destroy(struct net_device *dev,

				      struct neighbour *n)

{
@@ -2037,7 +2026,6 @@ static const struct net_device_ops rocker_port_netdev_ops = { 
	.ndo_set_mac_address		= rocker_port_set_mac_address,

	.ndo_change_mtu			= rocker_port_change_mtu,

	.ndo_get_phys_port_name		= rocker_port_get_phys_port_name,

	.ndo_change_proto_down		= rocker_port_change_proto_down,

	.ndo_neigh_destroy		= rocker_port_neigh_destroy,

	.ndo_get_port_parent_id		= rocker_port_get_port_parent_id,

};

drivers/net/macvlan.c

+1 −2
Original line number Diff line number Diff line
@@ -1171,7 +1171,6 @@ static const struct net_device_ops macvlan_netdev_ops = { 
#endif

	.ndo_get_iflink		= macvlan_dev_get_iflink,

	.ndo_features_check	= passthru_features_check,

	.ndo_change_proto_down  = dev_change_proto_down_generic,

};



void macvlan_common_setup(struct net_device *dev)
@@ -1182,7 +1181,7 @@ void macvlan_common_setup(struct net_device *dev) 
	dev->max_mtu		= ETH_MAX_MTU;

	dev->priv_flags	       &= ~IFF_TX_SKB_SHARING;

	netif_keep_dst(dev);

	dev->priv_flags	       |= IFF_UNICAST_FLT;

	dev->priv_flags	       |= IFF_UNICAST_FLT | IFF_CHANGE_PROTO_DOWN;

	dev->netdev_ops		= &macvlan_netdev_ops;

	dev->needs_free_netdev	= true;

	dev->header_ops		= &macvlan_hard_header_ops;

drivers/net/vxlan.c

+1 −2
Original line number Diff line number Diff line
@@ -3234,7 +3234,6 @@ static const struct net_device_ops vxlan_netdev_ether_ops = { 
	.ndo_fdb_dump		= vxlan_fdb_dump,

	.ndo_fdb_get		= vxlan_fdb_get,

	.ndo_fill_metadata_dst	= vxlan_fill_metadata_dst,

	.ndo_change_proto_down  = dev_change_proto_down_generic,

};



static const struct net_device_ops vxlan_netdev_raw_ops = {
@@ -3305,7 +3304,7 @@ static void vxlan_setup(struct net_device *dev) 
	dev->hw_features |= NETIF_F_RXCSUM;

	dev->hw_features |= NETIF_F_GSO_SOFTWARE;

	netif_keep_dst(dev);

	dev->priv_flags |= IFF_NO_QUEUE;

	dev->priv_flags |= IFF_NO_QUEUE | IFF_CHANGE_PROTO_DOWN;



	/* MTU range: 68 - 65535 */

	dev->min_mtu = ETH_MIN_MTU;

include/linux/netdevice.h

+3 −9
Original line number Diff line number Diff line
@@ -1297,11 +1297,6 @@ struct netdev_net_notifier { 
 *	TX queue.

 * int (*ndo_get_iflink)(const struct net_device *dev);

 *	Called to get the iflink value of this device.

 * void (*ndo_change_proto_down)(struct net_device *dev,

 *				 bool proto_down);

 *	This function is used to pass protocol port error state information

 *	to the switch driver. The switch driver can react to the proto_down

 *      by doing a phys down on the associated switch port.

 * int (*ndo_fill_metadata_dst)(struct net_device *dev, struct sk_buff *skb);

 *	This function is used to get egress tunnel information for given skb.

 *	This is useful for retrieving outer tunnel header parameters while
@@ -1542,8 +1537,6 @@ struct net_device_ops { 
						      int queue_index,

						      u32 maxrate);

	int			(*ndo_get_iflink)(const struct net_device *dev);

	int			(*ndo_change_proto_down)(struct net_device *dev,

							 bool proto_down);

	int			(*ndo_fill_metadata_dst)(struct net_device *dev,

						       struct sk_buff *skb);

	void			(*ndo_set_rx_headroom)(struct net_device *dev,
@@ -1612,6 +1605,7 @@ struct net_device_ops { 
 * @IFF_LIVE_RENAME_OK: rename is allowed while device is up and running

 * @IFF_TX_SKB_NO_LINEAR: device/driver is capable of xmitting frames with

 *	skb_headlen(skb) == 0 (data starts from frag0)

 * @IFF_CHANGE_PROTO_DOWN: device supports setting carrier via IFLA_PROTO_DOWN

 */

enum netdev_priv_flags {

	IFF_802_1Q_VLAN			= 1<<0,
@@ -1646,6 +1640,7 @@ enum netdev_priv_flags { 
	IFF_L3MDEV_RX_HANDLER		= 1<<29,

	IFF_LIVE_RENAME_OK		= 1<<30,

	IFF_TX_SKB_NO_LINEAR		= 1<<31,

	IFF_CHANGE_PROTO_DOWN		= BIT_ULL(32),

};



#define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN
@@ -1982,7 +1977,7 @@ struct net_device { 


	/* Read-mostly cache-line for fast-path access */

	unsigned int		flags;

	unsigned int		priv_flags;

	unsigned long long	priv_flags;

	const struct net_device_ops *netdev_ops;

	int			ifindex;

	unsigned short		gflags;
@@ -3735,7 +3730,6 @@ int dev_get_port_parent_id(struct net_device *dev, 
			   struct netdev_phys_item_id *ppid, bool recurse);

bool netdev_port_same_parent_id(struct net_device *a, struct net_device *b);

int dev_change_proto_down(struct net_device *dev, bool proto_down);

int dev_change_proto_down_generic(struct net_device *dev, bool proto_down);

void dev_change_proto_down_reason(struct net_device *dev, unsigned long mask,

				  u32 value);

struct sk_buff *validate_xmit_skb_list(struct sk_buff *skb, struct net_device *dev, bool *again);

net/8021q/vlanproc.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset) 


	stats = dev_get_stats(vlandev, &temp);

	seq_printf(seq,

		   "%s  VID: %d	 REORDER_HDR: %i  dev->priv_flags: %hx\n",

		   "%s  VID: %d	 REORDER_HDR: %i  dev->priv_flags: %llx\n",

		   vlandev->name, vlan->vlan_id,

		   (int)(vlan->flags & 1), vlandev->priv_flags);