summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNicolas de Pesloüan <nicolas.2p.debian@free.fr>2011-03-19 21:36:18 +0100
committerDavid S. Miller <davem@davemloft.net>2011-03-19 21:36:18 +0100
commitdadaa10b077133e5c03333131b82ecb13679af2b (patch)
treea13c20b71252303cd3726795c6bf5d2d970bc4f0 /drivers
parentftmac100: use resource_size() (diff)
downloadlinux-dadaa10b077133e5c03333131b82ecb13679af2b.tar.xz
linux-dadaa10b077133e5c03333131b82ecb13679af2b.zip
bonding: fix a typo in a comment
Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bonding/bond_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 1a6e9eb7af43..338bea147c64 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2130,7 +2130,7 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
}
/*
-* First release a slave and than destroy the bond if no more slaves are left.
+* First release a slave and then destroy the bond if no more slaves are left.
* Must be under rtnl_lock when this function is called.
*/
static int bond_release_and_destroy(struct net_device *bond_dev,