diff options
| author | NeilBrown <neilb@suse.de> | 2010-08-10 02:02:33 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-08-10 02:02:33 +0200 |
| commit | fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d (patch) | |
| tree | 311567d03758afc3a93b4273fe172836e89bb01d /Documentation/networking/ip-sysctl.txt | |
| parent | md: clean up do_md_stop (diff) | |
| parent | Merge branch 'async' of macbook:git/btrfs-unstable (diff) | |
| download | linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.tar.xz linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.zip | |
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
Diffstat (limited to 'Documentation/networking/ip-sysctl.txt')
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index d0536b5a4e01..f350c69b2bb4 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -903,7 +903,7 @@ arp_ignore - INTEGER arp_notify - BOOLEAN Define mode for notification of address and device changes. 0 - (default): do nothing - 1 - Generate gratuitous arp replies when device is brought up + 1 - Generate gratuitous arp requests when device is brought up or hardware address changes. arp_accept - BOOLEAN |