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

Commit b86f81cc authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

bridge: move br_net_exit() to br.c 



And it can become static.

Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae237b3e

net/bridge/br.c

+18 −3
Original line number Diff line number Diff line
@@ -22,14 +22,29 @@ 


#include "br_private.h"



static const struct stp_proto br_stp_proto = {

	.rcv	= br_stp_rcv,

};

static void __net_exit br_net_exit(struct net *net)

{

	struct net_device *dev;

	LIST_HEAD(list);



	rtnl_lock();

	for_each_netdev(net, dev)

		if (dev->priv_flags & IFF_EBRIDGE)

			br_dev_delete(dev, &list);



	unregister_netdevice_many(&list);

	rtnl_unlock();



}



static struct pernet_operations br_net_ops = {

	.exit	= br_net_exit,

};



static const struct stp_proto br_stp_proto = {

	.rcv	= br_stp_rcv,

};



static int __init br_init(void)

{

	int err;

net/bridge/br_if.c

+0 −15
Original line number Diff line number Diff line
@@ -455,18 +455,3 @@ int br_del_if(struct net_bridge *br, struct net_device *dev) 


	return 0;

}
 


void __net_exit br_net_exit(struct net *net)

{

	struct net_device *dev;

	LIST_HEAD(list);



	rtnl_lock();

	for_each_netdev(net, dev)

		if (dev->priv_flags & IFF_EBRIDGE)

			br_dev_delete(dev, &list);



	unregister_netdevice_many(&list);

	rtnl_unlock();



}

net/bridge/br_private.h

+0 −1
Original line number Diff line number Diff line
@@ -407,7 +407,6 @@ void br_flood_forward(struct net_bridge *br, struct sk_buff *skb, 
void br_port_carrier_check(struct net_bridge_port *p);

int br_add_bridge(struct net *net, const char *name);

int br_del_bridge(struct net *net, const char *name);

void br_net_exit(struct net *net);

int br_add_if(struct net_bridge *br, struct net_device *dev);

int br_del_if(struct net_bridge *br, struct net_device *dev);

int br_min_mtu(const struct net_bridge *br);