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

Commit b1282726 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

bridge: make br_device_notifier static 



Merge net/bridge/br_notify.c into net/bridge/br.c,
since it has only br_device_event() and br.c is small.

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 5c4a43b0

net/bridge/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
obj-$(CONFIG_BRIDGE) += bridge.o



bridge-y	:= br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \

			br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o \

			br_ioctl.o br_stp.o br_stp_bpdu.o \

			br_stp_if.o br_stp_timer.o br_netlink.o



bridge-$(CONFIG_SYSFS) += br_sysfs_if.o br_sysfs_br.o

net/bridge/br.c

+98 −0
Original line number Diff line number Diff line
@@ -22,6 +22,104 @@ 


#include "br_private.h"



/*

 * Handle changes in state of network devices enslaved to a bridge.

 *

 * Note: don't care about up/down if bridge itself is down, because

 *     port state is checked when bridge is brought up.

 */

static int br_device_event(struct notifier_block *unused, unsigned long event, void *ptr)

{

	struct net_device *dev = netdev_notifier_info_to_dev(ptr);

	struct net_bridge_port *p;

	struct net_bridge *br;

	bool changed_addr;

	int err;



	/* register of bridge completed, add sysfs entries */

	if ((dev->priv_flags & IFF_EBRIDGE) && event == NETDEV_REGISTER) {

		br_sysfs_addbr(dev);

		return NOTIFY_DONE;

	}



	/* not a port of a bridge */

	p = br_port_get_rtnl(dev);

	if (!p)

		return NOTIFY_DONE;



	br = p->br;



	switch (event) {

	case NETDEV_CHANGEMTU:

		dev_set_mtu(br->dev, br_min_mtu(br));

		break;



	case NETDEV_CHANGEADDR:

		spin_lock_bh(&br->lock);

		br_fdb_changeaddr(p, dev->dev_addr);

		changed_addr = br_stp_recalculate_bridge_id(br);

		spin_unlock_bh(&br->lock);



		if (changed_addr)

			call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);



		break;



	case NETDEV_CHANGE:

		br_port_carrier_check(p);

		break;



	case NETDEV_FEAT_CHANGE:

		netdev_update_features(br->dev);

		break;



	case NETDEV_DOWN:

		spin_lock_bh(&br->lock);

		if (br->dev->flags & IFF_UP)

			br_stp_disable_port(p);

		spin_unlock_bh(&br->lock);

		break;



	case NETDEV_UP:

		if (netif_running(br->dev) && netif_oper_up(dev)) {

			spin_lock_bh(&br->lock);

			br_stp_enable_port(p);

			spin_unlock_bh(&br->lock);

		}

		break;



	case NETDEV_UNREGISTER:

		br_del_if(br, dev);

		break;



	case NETDEV_CHANGENAME:

		err = br_sysfs_renameif(p);

		if (err)

			return notifier_from_errno(err);

		break;



	case NETDEV_PRE_TYPE_CHANGE:

		/* Forbid underlaying device to change its type. */

		return NOTIFY_BAD;



	case NETDEV_RESEND_IGMP:

		/* Propagate to master device */

		call_netdevice_notifiers(event, br->dev);

		break;

	}



	/* Events that may cause spanning tree to refresh */

	if (event == NETDEV_CHANGEADDR || event == NETDEV_UP ||

	    event == NETDEV_CHANGE || event == NETDEV_DOWN)

		br_ifinfo_notify(RTM_NEWLINK, p);



	return NOTIFY_DONE;

}



static struct notifier_block br_device_notifier = {

	.notifier_call = br_device_event

};



static void __net_exit br_net_exit(struct net *net)

{

	struct net_device *dev;

net/bridge/br_notify.c

deleted100644 → 0
+0 −118
Original line number Diff line number Diff line 
/*

 *	Device event handling

 *	Linux ethernet bridge

 *

 *	Authors:

 *	Lennert Buytenhek		<buytenh@gnu.org>

 *

 *	This program is free software; you can redistribute it and/or

 *	modify it under the terms of the GNU General Public License

 *	as published by the Free Software Foundation; either version

 *	2 of the License, or (at your option) any later version.

 */



#include <linux/kernel.h>

#include <linux/rtnetlink.h>

#include <net/net_namespace.h>



#include "br_private.h"



static int br_device_event(struct notifier_block *unused, unsigned long event, void *ptr);



struct notifier_block br_device_notifier = {

	.notifier_call = br_device_event

};



/*

 * Handle changes in state of network devices enslaved to a bridge.

 *

 * Note: don't care about up/down if bridge itself is down, because

 *     port state is checked when bridge is brought up.

 */

static int br_device_event(struct notifier_block *unused, unsigned long event, void *ptr)

{

	struct net_device *dev = netdev_notifier_info_to_dev(ptr);

	struct net_bridge_port *p;

	struct net_bridge *br;

	bool changed_addr;

	int err;



	/* register of bridge completed, add sysfs entries */

	if ((dev->priv_flags & IFF_EBRIDGE) && event == NETDEV_REGISTER) {

		br_sysfs_addbr(dev);

		return NOTIFY_DONE;

	}



	/* not a port of a bridge */

	p = br_port_get_rtnl(dev);

	if (!p)

		return NOTIFY_DONE;



	br = p->br;



	switch (event) {

	case NETDEV_CHANGEMTU:

		dev_set_mtu(br->dev, br_min_mtu(br));

		break;



	case NETDEV_CHANGEADDR:

		spin_lock_bh(&br->lock);

		br_fdb_changeaddr(p, dev->dev_addr);

		changed_addr = br_stp_recalculate_bridge_id(br);

		spin_unlock_bh(&br->lock);



		if (changed_addr)

			call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);



		break;



	case NETDEV_CHANGE:

		br_port_carrier_check(p);

		break;



	case NETDEV_FEAT_CHANGE:

		netdev_update_features(br->dev);

		break;



	case NETDEV_DOWN:

		spin_lock_bh(&br->lock);

		if (br->dev->flags & IFF_UP)

			br_stp_disable_port(p);

		spin_unlock_bh(&br->lock);

		break;



	case NETDEV_UP:

		if (netif_running(br->dev) && netif_oper_up(dev)) {

			spin_lock_bh(&br->lock);

			br_stp_enable_port(p);

			spin_unlock_bh(&br->lock);

		}

		break;



	case NETDEV_UNREGISTER:

		br_del_if(br, dev);

		break;



	case NETDEV_CHANGENAME:

		err = br_sysfs_renameif(p);

		if (err)

			return notifier_from_errno(err);

		break;



	case NETDEV_PRE_TYPE_CHANGE:

		/* Forbid underlaying device to change its type. */

		return NOTIFY_BAD;



	case NETDEV_RESEND_IGMP:

		/* Propagate to master device */

		call_netdevice_notifiers(event, br->dev);

		break;

	}



	/* Events that may cause spanning tree to refresh */

	if (event == NETDEV_CHANGEADDR || event == NETDEV_UP ||

	    event == NETDEV_CHANGE || event == NETDEV_DOWN)

		br_ifinfo_notify(RTM_NEWLINK, p);



	return NOTIFY_DONE;

}

net/bridge/br_private.h

+0 −2
Original line number Diff line number Diff line
@@ -333,8 +333,6 @@ struct br_input_skb_cb { 
#define br_debug(br, format, args...)			\

	pr_debug("%s: " format,  (br)->dev->name, ##args)



extern struct notifier_block br_device_notifier;



/* called under bridge lock */

static inline int br_is_root_bridge(const struct net_bridge *br)

{