Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d143d9f authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

net: core functions cleanup 



The following functions are not used outside of net/core/dev.c
and should be declared static.

  call_netdevice_notifiers_info
  __dev_remove_offload
  netdev_has_any_upper_dev
  __netdev_adjacent_dev_remove
  __netdev_adjacent_dev_link_lists
  __netdev_adjacent_dev_unlink_lists
  __netdev_adjacent_dev_unlink
  __netdev_adjacent_dev_link_neighbour
  __netdev_adjacent_dev_unlink_neighbour

And the following are never used and should be deleted
  netdev_lower_dev_get_private_rcu
  __netdev_find_adj_rcu

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2173f8d9

include/linux/netdevice.h

+0 −6
Original line number Diff line number Diff line
@@ -1741,8 +1741,6 @@ netdev_notifier_info_to_dev(const struct netdev_notifier_info *info) 
	return info->dev;

}



int call_netdevice_notifiers_info(unsigned long val, struct net_device *dev,

				  struct netdev_notifier_info *info);

int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
@@ -1809,7 +1807,6 @@ void dev_remove_pack(struct packet_type *pt); 
void __dev_remove_pack(struct packet_type *pt);

void dev_add_offload(struct packet_offload *po);

void dev_remove_offload(struct packet_offload *po);

void __dev_remove_offload(struct packet_offload *po);



struct net_device *dev_get_by_flags_rcu(struct net *net, unsigned short flags,

					unsigned short mask);
@@ -2867,7 +2864,6 @@ extern int weight_p; 
extern int		bpf_jit_enable;



bool netdev_has_upper_dev(struct net_device *dev, struct net_device *upper_dev);

bool netdev_has_any_upper_dev(struct net_device *dev);

struct net_device *netdev_all_upper_get_next_dev_rcu(struct net_device *dev,

						     struct list_head **iter);
@@ -2907,8 +2903,6 @@ int netdev_master_upper_dev_link_private(struct net_device *dev, 
					 void *private);

void netdev_upper_dev_unlink(struct net_device *dev,

			     struct net_device *upper_dev);

void *netdev_lower_dev_get_private_rcu(struct net_device *dev,

				       struct net_device *lower_dev);

void *netdev_lower_dev_get_private(struct net_device *dev,

				   struct net_device *lower_dev);

int skb_checksum_help(struct sk_buff *skb);

net/core/dev.c

+26 −56
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ EXPORT_SYMBOL(dev_add_offload); 
 *	and must not be freed until after all the CPU's have gone

 *	through a quiescent state.

 */

void __dev_remove_offload(struct packet_offload *po)

static void __dev_remove_offload(struct packet_offload *po)

{

	struct list_head *head = &offload_base;

	struct packet_offload *po1;
@@ -498,7 +498,6 @@ void __dev_remove_offload(struct packet_offload *po) 
out:

	spin_unlock(&offload_lock);

}

EXPORT_SYMBOL(__dev_remove_offload);



/**

 *	dev_remove_offload	 - remove packet offload handler
@@ -1566,14 +1565,14 @@ EXPORT_SYMBOL(unregister_netdevice_notifier); 
 *	are as for raw_notifier_call_chain().

 */



int call_netdevice_notifiers_info(unsigned long val, struct net_device *dev,

static int call_netdevice_notifiers_info(unsigned long val,

					 struct net_device *dev,

					 struct netdev_notifier_info *info)

{

	ASSERT_RTNL();

	netdev_notifier_info_init(info, dev);

	return raw_notifier_call_chain(&netdev_chain, val, info);

}

EXPORT_SYMBOL(call_netdevice_notifiers_info);



/**

 *	call_netdevice_notifiers - call all network notifier blocks
@@ -4355,19 +4354,6 @@ struct netdev_adjacent { 
	struct rcu_head rcu;

};



static struct netdev_adjacent *__netdev_find_adj_rcu(struct net_device *dev,

						     struct net_device *adj_dev,

						     struct list_head *adj_list)

{

	struct netdev_adjacent *adj;



	list_for_each_entry_rcu(adj, adj_list, list) {

		if (adj->dev == adj_dev)

			return adj;

	}

	return NULL;

}



static struct netdev_adjacent *__netdev_find_adj(struct net_device *dev,

						 struct net_device *adj_dev,

						 struct list_head *adj_list)
@@ -4406,13 +4392,12 @@ EXPORT_SYMBOL(netdev_has_upper_dev); 
 * Find out if a device is linked to an upper device and return true in case

 * it is. The caller must hold the RTNL lock.

 */

bool netdev_has_any_upper_dev(struct net_device *dev)

static bool netdev_has_any_upper_dev(struct net_device *dev)

{

	ASSERT_RTNL();



	return !list_empty(&dev->all_adj_list.upper);

}

EXPORT_SYMBOL(netdev_has_any_upper_dev);



/**

 * netdev_master_upper_dev_get - Get master upper device
@@ -4644,7 +4629,7 @@ static int __netdev_adjacent_dev_insert(struct net_device *dev, 
	return ret;

}



void __netdev_adjacent_dev_remove(struct net_device *dev,

static void __netdev_adjacent_dev_remove(struct net_device *dev,

					 struct net_device *adj_dev,

					 struct list_head *dev_list)

{
@@ -4684,7 +4669,7 @@ void __netdev_adjacent_dev_remove(struct net_device *dev, 
	kfree_rcu(adj, rcu);

}



int __netdev_adjacent_dev_link_lists(struct net_device *dev,

static int __netdev_adjacent_dev_link_lists(struct net_device *dev,

					    struct net_device *upper_dev,

					    struct list_head *up_list,

					    struct list_head *down_list,
@@ -4707,7 +4692,7 @@ int __netdev_adjacent_dev_link_lists(struct net_device *dev, 
	return 0;

}



int __netdev_adjacent_dev_link(struct net_device *dev,

static int __netdev_adjacent_dev_link(struct net_device *dev,

				      struct net_device *upper_dev)

{

	return __netdev_adjacent_dev_link_lists(dev, upper_dev,
@@ -4716,7 +4701,7 @@ int __netdev_adjacent_dev_link(struct net_device *dev, 
						NULL, false);

}



void __netdev_adjacent_dev_unlink_lists(struct net_device *dev,

static void __netdev_adjacent_dev_unlink_lists(struct net_device *dev,

					       struct net_device *upper_dev,

					       struct list_head *up_list,

					       struct list_head *down_list)
@@ -4725,7 +4710,7 @@ void __netdev_adjacent_dev_unlink_lists(struct net_device *dev, 
	__netdev_adjacent_dev_remove(upper_dev, dev, down_list);

}



void __netdev_adjacent_dev_unlink(struct net_device *dev,

static void __netdev_adjacent_dev_unlink(struct net_device *dev,

					 struct net_device *upper_dev)

{

	__netdev_adjacent_dev_unlink_lists(dev, upper_dev,
@@ -4733,7 +4718,7 @@ void __netdev_adjacent_dev_unlink(struct net_device *dev, 
					   &upper_dev->all_adj_list.lower);

}



int __netdev_adjacent_dev_link_neighbour(struct net_device *dev,

static int __netdev_adjacent_dev_link_neighbour(struct net_device *dev,

						struct net_device *upper_dev,

						void *private, bool master)

{
@@ -4754,7 +4739,7 @@ int __netdev_adjacent_dev_link_neighbour(struct net_device *dev, 
	return 0;

}



void __netdev_adjacent_dev_unlink_neighbour(struct net_device *dev,

static void __netdev_adjacent_dev_unlink_neighbour(struct net_device *dev,

						   struct net_device *upper_dev)

{

	__netdev_adjacent_dev_unlink(dev, upper_dev);
@@ -4944,21 +4929,6 @@ void netdev_upper_dev_unlink(struct net_device *dev, 
}

EXPORT_SYMBOL(netdev_upper_dev_unlink);



void *netdev_lower_dev_get_private_rcu(struct net_device *dev,

				       struct net_device *lower_dev)

{

	struct netdev_adjacent *lower;



	if (!lower_dev)

		return NULL;

	lower = __netdev_find_adj_rcu(dev, lower_dev, &dev->adj_list.lower);

	if (!lower)

		return NULL;



	return lower->private;

}

EXPORT_SYMBOL(netdev_lower_dev_get_private_rcu);



void *netdev_lower_dev_get_private(struct net_device *dev,

				   struct net_device *lower_dev)

{