Commit e3804cbe authored by Alexander Beregalov's avatar Alexander Beregalov Committed by David S. Miller
Browse files

net: remove COMPAT_NET_DEV_OPS 



All drivers are already converted to new net_device_ops API
and nobody uses old API anymore.

Signed-off-by: default avatarAlexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c649c0e3

drivers/net/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -25,15 +25,6 @@ menuconfig NETDEVICES 
# that for each of the symbols.

if NETDEVICES



config COMPAT_NET_DEV_OPS

       default y

       bool "Enable older network device API compatibility"

       ---help---

          This option enables kernel compatibility with older network devices

          that do not use net_device_ops interface.



	  If unsure, say Y.



config IFB

	tristate "Intermediate Functional Block support"

	depends on NET_CLS_ACT

include/linux/netdevice.h

+0 −38
Original line number Diff line number Diff line
@@ -901,44 +901,6 @@ struct net_device 
	/* max exchange id for FCoE LRO by ddp */

	unsigned int		fcoe_ddp_xid;

#endif



#ifdef CONFIG_COMPAT_NET_DEV_OPS

	struct {

		int			(*init)(struct net_device *dev);

		void			(*uninit)(struct net_device *dev);

		int			(*open)(struct net_device *dev);

		int			(*stop)(struct net_device *dev);

		int			(*hard_start_xmit) (struct sk_buff *skb,

							    struct net_device *dev);

		u16			(*select_queue)(struct net_device *dev,

							struct sk_buff *skb);

		void			(*change_rx_flags)(struct net_device *dev,

							   int flags);

		void			(*set_rx_mode)(struct net_device *dev);

		void			(*set_multicast_list)(struct net_device *dev);

		int			(*set_mac_address)(struct net_device *dev,

							   void *addr);

		int			(*validate_addr)(struct net_device *dev);

		int			(*do_ioctl)(struct net_device *dev,

						    struct ifreq *ifr, int cmd);

		int			(*set_config)(struct net_device *dev,

						      struct ifmap *map);

		int			(*change_mtu)(struct net_device *dev, int new_mtu);

		int			(*neigh_setup)(struct net_device *dev,

						       struct neigh_parms *);

		void			(*tx_timeout) (struct net_device *dev);

		struct net_device_stats* (*get_stats)(struct net_device *dev);

		void			(*vlan_rx_register)(struct net_device *dev,

							    struct vlan_group *grp);

		void			(*vlan_rx_add_vid)(struct net_device *dev,

							   unsigned short vid);

		void			(*vlan_rx_kill_vid)(struct net_device *dev,

							    unsigned short vid);

#ifdef CONFIG_NET_POLL_CONTROLLER

		void                    (*poll_controller)(struct net_device *dev);

#endif

	};

#endif

};

#define to_net_dev(d) container_of(d, struct net_device, dev)

net/802/fddi.c

+0 −4
Original line number Diff line number Diff line
@@ -185,10 +185,6 @@ static const struct header_ops fddi_header_ops = { 
static void fddi_setup(struct net_device *dev)

{

	dev->header_ops		= &fddi_header_ops;

#ifdef CONFIG_COMPAT_NET_DEV_OPS

	dev->change_mtu		= fddi_change_mtu,

#endif



	dev->type		= ARPHRD_FDDI;

	dev->hard_header_len	= FDDI_K_SNAP_HLEN+3;	/* Assume 802.2 SNAP hdr len + 3 pad bytes */

	dev->mtu		= FDDI_K_SNAP_DLEN;	/* Assume max payload of 802.2 SNAP frame */

net/802/hippi.c

+0 −5
Original line number Diff line number Diff line
@@ -193,11 +193,6 @@ static const struct header_ops hippi_header_ops = { 


static void hippi_setup(struct net_device *dev)

{

#ifdef CONFIG_COMPAT_NET_DEV_OPS

	dev->change_mtu			= hippi_change_mtu;

	dev->set_mac_address 		= hippi_mac_addr;

	dev->neigh_setup 		= hippi_neigh_setup_dev;

#endif

	dev->header_ops			= &hippi_header_ops;



	/*

net/8021q/vlan_dev.c

+0 −1
Original line number Diff line number Diff line
@@ -644,7 +644,6 @@ static int vlan_dev_init(struct net_device *dev) 
		dev->hard_header_len = real_dev->hard_header_len + VLAN_HLEN;

		dev->netdev_ops         = &vlan_netdev_ops;

	}

	netdev_resync_ops(dev);



	if (is_vlan_dev(real_dev))

		subclass = 1;