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

Commit 28a16c97 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

bridge: change console message interface 



Use one set of macro's for all bridge messages.

Note: can't use netdev_XXX macro's because bridge is purely
virtual and has no device parent.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cfb478da

net/bridge/br.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static int __init br_init(void) 


	err = stp_proto_register(&br_stp_proto);

	if (err < 0) {

		printk(KERN_ERR "bridge: can't register sap for STP\n");

		pr_err("bridge: can't register sap for STP\n");

		return err;

	}

net/bridge/br_device.c

+2 −3
Original line number Diff line number Diff line
@@ -263,9 +263,8 @@ void br_netpoll_enable(struct net_bridge *br, 
			dev->npinfo = br->dev->npinfo;

	} else if (!(br->dev->priv_flags & IFF_DISABLE_NETPOLL)) {

		br->dev->priv_flags |= IFF_DISABLE_NETPOLL;

		printk(KERN_INFO "%s:new device %s"

			" does not support netpoll (disabling)",

			br->dev->name, dev->name);

		br_info(br,"new device %s does not support netpoll (disabling)",

			dev->name);

	}

}

net/bridge/br_fdb.c

+4 −5
Original line number Diff line number Diff line
@@ -353,8 +353,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source, 
		 */

		if (fdb->is_local)

			return 0;



		printk(KERN_WARNING "%s adding interface with same address "

		br_warn(br, "adding interface %s with same address "

		       "as a received packet\n",

		       source->dev->name);

		fdb_delete(fdb);
@@ -397,7 +396,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, 
		/* attempt to update an entry for a local interface */

		if (unlikely(fdb->is_local)) {

			if (net_ratelimit())

				printk(KERN_WARNING "%s: received packet with "

				br_warn(br, "received packet on %s with "

					"own address as source address\n",

					source->dev->name);

		} else {

net/bridge/br_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -412,6 +412,6 @@ int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 


	}



	pr_debug("Bridge does not support ioctl 0x%x\n", cmd);

	br_debug(br, "Bridge does not support ioctl 0x%x\n", cmd);

	return -EOPNOTSUPP;

}

net/bridge/br_multicast.c

+13 −19
Original line number Diff line number Diff line
@@ -585,10 +585,9 @@ static struct net_bridge_mdb_entry *br_multicast_get_group( 


	if (unlikely(count > br->hash_elasticity && count)) {

		if (net_ratelimit())

			printk(KERN_INFO "%s: Multicast hash table "

			br_info(br, "Multicast hash table "

				"chain limit reached: %s\n",

			       br->dev->name, port ? port->dev->name :

						     br->dev->name);

				port ? port->dev->name : br->dev->name);



		elasticity = br->hash_elasticity;

	}
@@ -596,11 +595,9 @@ static struct net_bridge_mdb_entry *br_multicast_get_group( 
	if (mdb->size >= max) {

		max *= 2;

		if (unlikely(max >= br->hash_max)) {

			printk(KERN_WARNING "%s: Multicast hash table maximum "

			br_warn(br, "Multicast hash table maximum "

				"reached, disabling snooping: %s, %d\n",

			       br->dev->name, port ? port->dev->name :

						     br->dev->name,

			       max);

				port ? port->dev->name : br->dev->name, max);

			err = -E2BIG;

disable:

			br->multicast_disabled = 1;
@@ -611,21 +608,18 @@ static struct net_bridge_mdb_entry *br_multicast_get_group( 
	if (max > mdb->max || elasticity) {

		if (mdb->old) {

			if (net_ratelimit())

				printk(KERN_INFO "%s: Multicast hash table "

				br_info(br, "Multicast hash table "

					"on fire: %s\n",

				       br->dev->name, port ? port->dev->name :

							     br->dev->name);

					port ? port->dev->name : br->dev->name);

			err = -EEXIST;

			goto err;

		}



		err = br_mdb_rehash(&br->mdb, max, elasticity);

		if (err) {

			printk(KERN_WARNING "%s: Cannot rehash multicast "

			       "hash table, disabling snooping: "

			       "%s, %d, %d\n",

			       br->dev->name, port ? port->dev->name :

						     br->dev->name,

			br_warn(br, "Cannot rehash multicast "

				"hash table, disabling snooping: %s, %d, %d\n",

				port ? port->dev->name : br->dev->name,

				mdb->size, err);

			goto disable;

		}