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

Commit cceb904f authored by Adrian Bunk's avatar Adrian Bunk Committed by Jeff Garzik
Browse files

[PATCH] drivers/net/bonding/bonding.h: "extern inline" -> "static inline"



"extern inline" doesn't make much sense.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent f65fd8fb
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
@@ -205,7 +205,7 @@ struct bonding {
 *
 *
 * Caller must hold bond lock for read
 * Caller must hold bond lock for read
 */
 */
extern inline struct slave *bond_get_slave_by_dev(struct bonding *bond, struct net_device *slave_dev)
static inline struct slave *bond_get_slave_by_dev(struct bonding *bond, struct net_device *slave_dev)
{
{
	struct slave *slave = NULL;
	struct slave *slave = NULL;
	int i;
	int i;
@@ -219,7 +219,7 @@ extern inline struct slave *bond_get_slave_by_dev(struct bonding *bond, struct n
	return slave;
	return slave;
}
}


extern inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
{
{
	if (!slave || !slave->dev->master) {
	if (!slave || !slave->dev->master) {
		return NULL;
		return NULL;
@@ -228,13 +228,13 @@ extern inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
	return (struct bonding *)slave->dev->master->priv;
	return (struct bonding *)slave->dev->master->priv;
}
}


extern inline void bond_set_slave_inactive_flags(struct slave *slave)
static inline void bond_set_slave_inactive_flags(struct slave *slave)
{
{
	slave->state = BOND_STATE_BACKUP;
	slave->state = BOND_STATE_BACKUP;
	slave->dev->flags |= IFF_NOARP;
	slave->dev->flags |= IFF_NOARP;
}
}


extern inline void bond_set_slave_active_flags(struct slave *slave)
static inline void bond_set_slave_active_flags(struct slave *slave)
{
{
	slave->state = BOND_STATE_ACTIVE;
	slave->state = BOND_STATE_ACTIVE;
	slave->dev->flags &= ~IFF_NOARP;
	slave->dev->flags &= ~IFF_NOARP;