Commit d1b19dff authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: net/core/dev.c cleanups 



Pure style cleanup patch before surgery :)

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 137742cf

net/core/dev.c

+292 −297
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ static struct list_head ptype_all __read_mostly; /* Taps */ 
 * semaphore held.

 */

DEFINE_RWLOCK(dev_base_lock);



EXPORT_SYMBOL(dev_base_lock);



#define NETDEV_HASHBITS	8
@@ -248,6 +247,7 @@ static RAW_NOTIFIER_HEAD(netdev_chain); 
 */



DEFINE_PER_CPU(struct softnet_data, softnet_data);

EXPORT_PER_CPU_SYMBOL(softnet_data);



#ifdef CONFIG_LOCKDEP

/*
@@ -381,6 +381,7 @@ void dev_add_pack(struct packet_type *pt) 
	}

	spin_unlock_bh(&ptype_lock);

}

EXPORT_SYMBOL(dev_add_pack);



/**

 *	__dev_remove_pack	 - remove packet handler
@@ -418,6 +419,8 @@ void __dev_remove_pack(struct packet_type *pt) 
out:

	spin_unlock_bh(&ptype_lock);

}

EXPORT_SYMBOL(__dev_remove_pack);



/**

 *	dev_remove_pack	 - remove packet handler

 *	@pt: packet type declaration
@@ -436,6 +439,7 @@ void dev_remove_pack(struct packet_type *pt) 


	synchronize_net();

}

EXPORT_SYMBOL(dev_remove_pack);



/******************************************************************************
@@ -499,6 +503,7 @@ int netdev_boot_setup_check(struct net_device *dev) 
	}

	return 0;

}

EXPORT_SYMBOL(netdev_boot_setup_check);





/**
@@ -591,6 +596,7 @@ struct net_device *__dev_get_by_name(struct net *net, const char *name) 
	}

	return NULL;

}

EXPORT_SYMBOL(__dev_get_by_name);



/**

 *	dev_get_by_name		- find a device by its name
@@ -615,6 +621,7 @@ struct net_device *dev_get_by_name(struct net *net, const char *name) 
	read_unlock(&dev_base_lock);

	return dev;

}

EXPORT_SYMBOL(dev_get_by_name);



/**

 *	__dev_get_by_index - find a device by its ifindex
@@ -640,6 +647,7 @@ struct net_device *__dev_get_by_index(struct net *net, int ifindex) 
	}

	return NULL;

}

EXPORT_SYMBOL(__dev_get_by_index);





/**
@@ -664,6 +672,7 @@ struct net_device *dev_get_by_index(struct net *net, int ifindex) 
	read_unlock(&dev_base_lock);

	return dev;

}

EXPORT_SYMBOL(dev_get_by_index);



/**

 *	dev_getbyhwaddr - find a device by its hardware address
@@ -693,7 +702,6 @@ struct net_device *dev_getbyhwaddr(struct net *net, unsigned short type, char *h 


	return NULL;

}



EXPORT_SYMBOL(dev_getbyhwaddr);



struct net_device *__dev_getfirstbyhwtype(struct net *net, unsigned short type)
@@ -707,7 +715,6 @@ struct net_device *__dev_getfirstbyhwtype(struct net *net, unsigned short type) 


	return NULL;

}



EXPORT_SYMBOL(__dev_getfirstbyhwtype);



struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type)
@@ -721,7 +728,6 @@ struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type) 
	rtnl_unlock();

	return dev;

}



EXPORT_SYMBOL(dev_getfirstbyhwtype);



/**
@@ -736,7 +742,8 @@ EXPORT_SYMBOL(dev_getfirstbyhwtype); 
 *	dev_put to indicate they have finished with it.

 */



struct net_device * dev_get_by_flags(struct net *net, unsigned short if_flags, unsigned short mask)

struct net_device *dev_get_by_flags(struct net *net, unsigned short if_flags,

				    unsigned short mask)

{

	struct net_device *dev, *ret;
@@ -752,6 +759,7 @@ struct net_device * dev_get_by_flags(struct net *net, unsigned short if_flags, u 
	read_unlock(&dev_base_lock);

	return ret;

}

EXPORT_SYMBOL(dev_get_by_flags);



/**

 *	dev_valid_name - check if name is okay for network device
@@ -777,6 +785,7 @@ int dev_valid_name(const char *name) 
	}

	return 1;

}

EXPORT_SYMBOL(dev_valid_name);



/**

 *	__dev_alloc_name - allocate a name for a device
@@ -870,6 +879,7 @@ int dev_alloc_name(struct net_device *dev, const char *name) 
		strlcpy(dev->name, buf, IFNAMSIZ);

	return ret;

}

EXPORT_SYMBOL(dev_alloc_name);





/**
@@ -906,8 +916,7 @@ int dev_change_name(struct net_device *dev, const char *newname) 
		err = dev_alloc_name(dev, newname);

		if (err < 0)

			return err;

	}

	else if (__dev_get_by_name(net, newname))

	} else if (__dev_get_by_name(net, newname))

		return -EEXIST;

	else

		strlcpy(dev->name, newname, IFNAMSIZ);
@@ -1006,6 +1015,7 @@ void netdev_state_change(struct net_device *dev) 
		rtmsg_ifinfo(RTM_NEWLINK, dev, 0);

	}

}

EXPORT_SYMBOL(netdev_state_change);



void netdev_bonding_change(struct net_device *dev)

{
@@ -1034,6 +1044,7 @@ void dev_load(struct net *net, const char *name) 
	if (!dev && capable(CAP_SYS_MODULE))

		request_module("%s", name);

}

EXPORT_SYMBOL(dev_load);



/**

 *	dev_open	- prepare an interface for use.
@@ -1118,6 +1129,7 @@ int dev_open(struct net_device *dev) 


	return ret;

}

EXPORT_SYMBOL(dev_open);



/**

 *	dev_close - shutdown an interface.
@@ -1184,6 +1196,7 @@ int dev_close(struct net_device *dev) 


	return 0;

}

EXPORT_SYMBOL(dev_close);





/**
@@ -1279,6 +1292,7 @@ int register_netdevice_notifier(struct notifier_block *nb) 
	raw_notifier_chain_unregister(&netdev_chain, nb);

	goto unlock;

}

EXPORT_SYMBOL(register_netdevice_notifier);



/**

 *	unregister_netdevice_notifier - unregister a network notifier block
@@ -1299,6 +1313,7 @@ int unregister_netdevice_notifier(struct notifier_block *nb) 
	rtnl_unlock();

	return err;

}

EXPORT_SYMBOL(unregister_netdevice_notifier);



/**

 *	call_netdevice_notifiers - call all network notifier blocks
@@ -1321,11 +1336,13 @@ void net_enable_timestamp(void) 
{

	atomic_inc(&netstamp_needed);

}

EXPORT_SYMBOL(net_enable_timestamp);



void net_disable_timestamp(void)

{

	atomic_dec(&netstamp_needed);

}

EXPORT_SYMBOL(net_disable_timestamp);



static inline void net_timestamp(struct sk_buff *skb)

{
@@ -1527,6 +1544,7 @@ int skb_checksum_help(struct sk_buff *skb) 
out:

	return ret;

}

EXPORT_SYMBOL(skb_checksum_help);



/**

 *	skb_gso_segment - Perform segmentation on skb.
@@ -1589,7 +1607,6 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features) 


	return segs;

}



EXPORT_SYMBOL(skb_gso_segment);



/* Take action when hardware reception checksum errors are detected. */
@@ -1946,6 +1963,7 @@ int dev_queue_xmit(struct sk_buff *skb) 
	rcu_read_unlock_bh();

	return rc;

}

EXPORT_SYMBOL(dev_queue_xmit);





/*=======================================================================
@@ -2012,6 +2030,7 @@ int netif_rx(struct sk_buff *skb) 
	kfree_skb(skb);

	return NET_RX_DROP;

}

EXPORT_SYMBOL(netif_rx);



int netif_rx_ni(struct sk_buff *skb)

{
@@ -2025,7 +2044,6 @@ int netif_rx_ni(struct sk_buff *skb) 


	return err;

}



EXPORT_SYMBOL(netif_rx_ni);



static void net_tx_action(struct softirq_action *h)
@@ -2358,6 +2376,7 @@ int netif_receive_skb(struct sk_buff *skb) 
	rcu_read_unlock();

	return ret;

}

EXPORT_SYMBOL(netif_receive_skb);



/* Network device is going away, flush any packets still pending  */

static void flush_backlog(void *arg)
@@ -2892,6 +2911,7 @@ int register_gifconf(unsigned int family, gifconf_func_t * gifconf) 
	gifconf_list[family] = gifconf;

	return 0;

}

EXPORT_SYMBOL(register_gifconf);





/*
@@ -3338,6 +3358,7 @@ int netdev_set_master(struct net_device *slave, struct net_device *master) 
	rtmsg_ifinfo(RTM_NEWLINK, slave, IFF_SLAVE);

	return 0;

}

EXPORT_SYMBOL(netdev_set_master);



static void dev_change_rx_flags(struct net_device *dev, int flags)

{
@@ -3416,6 +3437,7 @@ int dev_set_promiscuity(struct net_device *dev, int inc) 
		dev_set_rx_mode(dev);

	return err;

}

EXPORT_SYMBOL(dev_set_promiscuity);



/**

 *	dev_set_allmulti	- update allmulti count on a device
@@ -3459,6 +3481,7 @@ int dev_set_allmulti(struct net_device *dev, int inc) 
	}

	return 0;

}

EXPORT_SYMBOL(dev_set_allmulti);



/*

 *	Upload unicast and multicast address lists to device and
@@ -4088,6 +4111,7 @@ unsigned dev_get_flags(const struct net_device *dev) 


	return flags;

}

EXPORT_SYMBOL(dev_get_flags);



/**

 *	dev_change_flags - change device settings
@@ -4143,7 +4167,8 @@ int dev_change_flags(struct net_device *dev, unsigned flags) 
		call_netdevice_notifiers(NETDEV_CHANGE, dev);



	if ((flags ^ dev->gflags) & IFF_PROMISC) {

		int inc = (flags & IFF_PROMISC) ? +1 : -1;

		int inc = (flags & IFF_PROMISC) ? 1 : -1;



		dev->gflags ^= IFF_PROMISC;

		dev_set_promiscuity(dev, inc);

	}
@@ -4153,7 +4178,8 @@ int dev_change_flags(struct net_device *dev, unsigned flags) 
	   IFF_ALLMULTI is requested not asking us and not reporting.

	 */

	if ((flags ^ dev->gflags) & IFF_ALLMULTI) {

		int inc = (flags & IFF_ALLMULTI) ? +1 : -1;

		int inc = (flags & IFF_ALLMULTI) ? 1 : -1;



		dev->gflags ^= IFF_ALLMULTI;

		dev_set_allmulti(dev, inc);

	}
@@ -4165,6 +4191,7 @@ int dev_change_flags(struct net_device *dev, unsigned flags) 


	return ret;

}

EXPORT_SYMBOL(dev_change_flags);



/**

 *	dev_set_mtu - Change maximum transfer unit
@@ -4198,6 +4225,7 @@ int dev_set_mtu(struct net_device *dev, int new_mtu) 
		call_netdevice_notifiers(NETDEV_CHANGEMTU, dev);

	return err;

}

EXPORT_SYMBOL(dev_set_mtu);



/**

 *	dev_set_mac_address - Change Media Access Control Address
@@ -4222,6 +4250,7 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa) 
		call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);

	return err;

}

EXPORT_SYMBOL(dev_set_mac_address);



/*

 *	Perform the SIOCxIFxxx calls, inside read_lock(dev_base_lock)
@@ -4365,7 +4394,6 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) 
	/*

	 *	Unknown or private ioctl

	 */



	default:

		if ((cmd >= SIOCDEVPRIVATE &&

		    cmd <= SIOCDEVPRIVATE + 15) ||
@@ -4840,6 +4868,7 @@ int register_netdevice(struct net_device *dev) 
		dev->netdev_ops->ndo_uninit(dev);

	goto out;

}

EXPORT_SYMBOL(register_netdevice);



/**

 *	init_dummy_netdev	- init a dummy network device for NAPI
@@ -5126,6 +5155,8 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name, 
	}



	dev = PTR_ALIGN(p, NETDEV_ALIGN);

	pr_err("%s dev=%p queue_count=%d tx=%p\n", name, dev, queue_count, tx);

	WARN_ON(queue_count == 1);

	dev->padded = (char *)dev - (char *)p;



	if (dev_addr_init(dev))
@@ -5192,6 +5223,7 @@ void free_netdev(struct net_device *dev) 
	/* will free via device release */

	put_device(&dev->dev);

}

EXPORT_SYMBOL(free_netdev);



/**

 *	synchronize_net -  Synchronize with packet receive processing
@@ -5204,6 +5236,7 @@ void synchronize_net(void) 
	might_sleep();

	synchronize_rcu();

}

EXPORT_SYMBOL(synchronize_net);



/**

 *	unregister_netdevice - remove device from the kernel
@@ -5224,6 +5257,7 @@ void unregister_netdevice(struct net_device *dev) 
	/* Finish processing unregister after unlock */

	net_set_todo(dev);

}

EXPORT_SYMBOL(unregister_netdevice);



/**

 *	unregister_netdev - remove device from the kernel
@@ -5242,7 +5276,6 @@ void unregister_netdev(struct net_device *dev) 
	unregister_netdevice(dev);

	rtnl_unlock();

}



EXPORT_SYMBOL(unregister_netdev);



/**
@@ -5658,41 +5691,3 @@ static int __init initialize_hashrnd(void) 


late_initcall_sync(initialize_hashrnd);

EXPORT_SYMBOL(__dev_get_by_index);

EXPORT_SYMBOL(__dev_get_by_name);

EXPORT_SYMBOL(__dev_remove_pack);

EXPORT_SYMBOL(dev_valid_name);

EXPORT_SYMBOL(dev_add_pack);

EXPORT_SYMBOL(dev_alloc_name);

EXPORT_SYMBOL(dev_close);

EXPORT_SYMBOL(dev_get_by_flags);

EXPORT_SYMBOL(dev_get_by_index);

EXPORT_SYMBOL(dev_get_by_name);

EXPORT_SYMBOL(dev_open);

EXPORT_SYMBOL(dev_queue_xmit);

EXPORT_SYMBOL(dev_remove_pack);

EXPORT_SYMBOL(dev_set_allmulti);

EXPORT_SYMBOL(dev_set_promiscuity);

EXPORT_SYMBOL(dev_change_flags);

EXPORT_SYMBOL(dev_set_mtu);

EXPORT_SYMBOL(dev_set_mac_address);

EXPORT_SYMBOL(free_netdev);

EXPORT_SYMBOL(netdev_boot_setup_check);

EXPORT_SYMBOL(netdev_set_master);

EXPORT_SYMBOL(netdev_state_change);

EXPORT_SYMBOL(netif_receive_skb);

EXPORT_SYMBOL(netif_rx);

EXPORT_SYMBOL(register_gifconf);

EXPORT_SYMBOL(register_netdevice);

EXPORT_SYMBOL(register_netdevice_notifier);

EXPORT_SYMBOL(skb_checksum_help);

EXPORT_SYMBOL(synchronize_net);

EXPORT_SYMBOL(unregister_netdevice);

EXPORT_SYMBOL(unregister_netdevice_notifier);

EXPORT_SYMBOL(net_enable_timestamp);

EXPORT_SYMBOL(net_disable_timestamp);

EXPORT_SYMBOL(dev_get_flags);



EXPORT_SYMBOL(dev_load);



EXPORT_PER_CPU_SYMBOL(softnet_data);