diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:24:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:24:55 -0500 |
| commit | 74d89c16735d83349ea74232031819e989a49156 (patch) | |
| tree | 1d8ded9c76b6ebe97c3841bbb986aacd63a801e5 /drivers/net/bonding/bond_main.c | |
| parent | 52a3220599647ba429fcbca2388ec35b850fa72f (diff) | |
| parent | 05c8e0ac5c37e9739a852b526afeecae97607cbb (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 2d0ac169a86c..f13a539dc169 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3159,7 +3159,7 @@ static int bond_slave_netdev_event(unsigned long event, struct net_device *slave * bond_netdev_event: handle netdev notifier chain events. * * This function receives events for the netdev chain. The caller (an - * ioctl handler calling notifier_call_chain) holds the necessary + * ioctl handler calling blocking_notifier_call_chain) holds the necessary * locks for us to safely manipulate the slave devices (RTNL lock, * dev_probe_lock). */ |