]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 231092a) | patch
bonding: fix merge issue introduced by 21844825.
authorRama Nichanamatlu <rama.nichanamatlu@oracle.com>
Tue, 20 Oct 2015 06:24:53 +0000 (23:24 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 22 Oct 2015 20:47:45 +0000 (13:47 -0700)
commit4b9adb73da8290bec020bd2dac46dbed246a11c4
tree63319db733bde7ade59b6b9422d9f5f2305b8c59tree
parent231092a6df3979397498f04716d93d1c20369e78commit | diff
bonding: fix merge issue introduced by 21844825.

Manual merge of fix 17557056 from uek2 into uek4 thru 21844825 resulted
in bonding arp monitor sending arp requests but whose arp replies were
being ignored or not inspected. This bug fixes it.

Orabug: 22025692

Signed-off-by: Rama Nichanamatlu <rama.nichanamatlu@oracle.com>
Signed-off-by: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
drivers/net/bonding/bond_main.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.