diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-04 08:05:07 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 08:05:07 -0400 |
| commit | 7a996d3ab150bb0e1b71fa182f70199a703efdd1 (patch) | |
| tree | 96a36947d90c9b96580899abd38cb3b70cd9d40b /Documentation/networking/ifenslave.c | |
| parent | 7cf3d73b4360e91b14326632ab1aeda4cb26308d (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into kbuild/kconfig
Conflicts:
scripts/kconfig/Makefile
Diffstat (limited to 'Documentation/networking/ifenslave.c')
| -rw-r--r-- | Documentation/networking/ifenslave.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/ifenslave.c b/Documentation/networking/ifenslave.c index 1b96ccda3836..2bac9618c345 100644 --- a/Documentation/networking/ifenslave.c +++ b/Documentation/networking/ifenslave.c | |||
| @@ -756,7 +756,7 @@ static int enslave(char *master_ifname, char *slave_ifname) | |||
| 756 | */ | 756 | */ |
| 757 | if (abi_ver < 1) { | 757 | if (abi_ver < 1) { |
| 758 | /* For old ABI, the master needs to be | 758 | /* For old ABI, the master needs to be |
| 759 | * down before setting it's hwaddr | 759 | * down before setting its hwaddr |
| 760 | */ | 760 | */ |
| 761 | res = set_if_down(master_ifname, master_flags.ifr_flags); | 761 | res = set_if_down(master_ifname, master_flags.ifr_flags); |
| 762 | if (res) { | 762 | if (res) { |