Commit d147dd70 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bareudp-remove-unused' 



Guillaume Nault says:

====================
bareudp: Remove unused code from header file

Stop exporting unused functions and structures in bareudp.h. The only
piece of bareudp.h that is actually used is netif_is_bareudp(). The
rest can be moved to bareudp.c or even dropped entirely.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6180c780 dcdd77ee

drivers/net/bareudp.c

+7 −34
Original line number Diff line number Diff line
@@ -38,6 +38,13 @@ struct bareudp_net { 
	struct list_head        bareudp_list;

};



struct bareudp_conf {

	__be16 ethertype;

	__be16 port;

	u16 sport_min;

	bool multi_proto_mode;

};



/* Pseudo network device */

struct bareudp_dev {

	struct net         *net;        /* netns for packet i/o */
@@ -721,40 +728,6 @@ static struct rtnl_link_ops bareudp_link_ops __read_mostly = { 
	.fill_info      = bareudp_fill_info,

};



struct net_device *bareudp_dev_create(struct net *net, const char *name,

				      u8 name_assign_type,

				      struct bareudp_conf *conf)

{

	struct nlattr *tb[IFLA_MAX + 1];

	struct net_device *dev;

	int err;



	memset(tb, 0, sizeof(tb));

	dev = rtnl_create_link(net, name, name_assign_type,

			       &bareudp_link_ops, tb, NULL);

	if (IS_ERR(dev))

		return dev;



	err = bareudp_configure(net, dev, conf);

	if (err) {

		free_netdev(dev);

		return ERR_PTR(err);

	}

	err = dev_set_mtu(dev, IP_MAX_MTU - BAREUDP_BASE_HLEN);

	if (err)

		goto err;



	err = rtnl_configure_link(dev, NULL);

	if (err < 0)

		goto err;



	return dev;

err:

	bareudp_dellink(dev, NULL);

	return ERR_PTR(err);

}

EXPORT_SYMBOL_GPL(bareudp_dev_create);



static __net_init int bareudp_init_net(struct net *net)

{

	struct bareudp_net *bn = net_generic(net, bareudp_net_id);

include/net/bareudp.h

+1 −12
Original line number Diff line number Diff line
@@ -3,21 +3,10 @@ 
#ifndef __NET_BAREUDP_H

#define __NET_BAREUDP_H



#include <linux/netdevice.h>

#include <linux/types.h>

#include <linux/skbuff.h>

#include <net/rtnetlink.h>



struct bareudp_conf {

	__be16 ethertype;

	__be16 port;

	u16 sport_min;

	bool multi_proto_mode;

};



struct net_device *bareudp_dev_create(struct net *net, const char *name,

				      u8 name_assign_type,

				      struct bareudp_conf *info);



static inline bool netif_is_bareudp(const struct net_device *dev)

{

	return dev->rtnl_link_ops &&