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

Commit 149ddd83 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2) 



This ensures that bridges created with brctl(8) or ioctl(2) directly
also carry IFLA_LINKINFO when dumped over netlink. This also allows
to create a bridge with ioctl(2) and delete it with RTM_DELLINK.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7ffde35

net/bridge/br_if.c

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ int br_add_bridge(struct net *net, const char *name) 
		return -ENOMEM;



	dev_net_set(dev, net);

	dev->rtnl_link_ops = &br_link_ops;



	res = register_netdev(dev);

	if (res)

net/bridge/br_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[]) 
	return 0;

}



static struct rtnl_link_ops br_link_ops __read_mostly = {

struct rtnl_link_ops br_link_ops __read_mostly = {

	.kind		= "bridge",

	.priv_size	= sizeof(struct net_bridge),

	.setup		= br_dev_setup,

net/bridge/br_private.h

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr) 
#endif



/* br_netlink.c */

extern struct rtnl_link_ops br_link_ops;

extern int br_netlink_init(void);

extern void br_netlink_fini(void);

extern void br_ifinfo_notify(int event, struct net_bridge_port *port);