diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 07:41:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 07:41:56 -0700 |
| commit | cd97824994042b809493807ea644ba26c0c23290 (patch) | |
| tree | 705d9d069130330d4d9d2a23cd9ff99ec8187f28 /Documentation | |
| parent | 3307f19f634dfb134b370c59a778fdb2d574c17b (diff) | |
| parent | 3664090e199f10cb0282097faae8f8ca58c1e4ae (diff) | |
| download | op-kernel-dev-cd97824994042b809493807ea644ba26c0c23290.zip op-kernel-dev-cd97824994042b809493807ea644ba26c0c23290.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (64 commits)
phylib: Fix delay argument of schedule_delayed_work
NET/ixgbe: Fix powering off during shutdown
NET/e1000e: Fix powering off during shutdown
NET/e1000: Fix powering off during shutdown
packet: avoid warnings when high-order page allocation fails
gianfar: stop send queue before resetting gianfar
myr10ge: again fix lro_gen_skb() alignment
declance: convert to net_device_ops
bfin_mac: convert to net_device_ops
au1000: convert to net_device_ops
atarilance: convert to net_device_ops
a2065: convert to net_device_ops
ixgbe: update real_num_tx_queues on changing num_rx_queues
ixgbe: fix tx queue index
Revert "rose: zero length frame filtering in af_rose.c"
sfc: Use correct macro to set event bitfield
sfc: Match calls to netif_napi_add() and netif_napi_del()
bonding: Remove debug printk
e1000/e1000: fix compile warning
ehea: Fix incomplete conversion to net_device_ops
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/bonding.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt index 5ede747..0876275 100644 --- a/Documentation/networking/bonding.txt +++ b/Documentation/networking/bonding.txt @@ -1242,7 +1242,7 @@ monitoring is enabled, and vice-versa. To add ARP targets: # echo +192.168.0.100 > /sys/class/net/bond0/bonding/arp_ip_target # echo +192.168.0.101 > /sys/class/net/bond0/bonding/arp_ip_target - NOTE: up to 10 target addresses may be specified. + NOTE: up to 16 target addresses may be specified. To remove an ARP target: # echo -192.168.0.100 > /sys/class/net/bond0/bonding/arp_ip_target |
