]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 278bc42) | patch
batman-adv: Fix merge error.
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Dec 2011 20:07:28 +0000 (15:07 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Dec 2011 20:07:28 +0000 (15:07 -0500)
commit220b07e90e3b7b3adc60b8a72c79ad4465312072
tree06421abf3e8976395e37f2d42ae4c2e0f6662ec8tree | snapshot
parent278bc4296bd64ffd1d3913b487dc8a520e423a7acommit | diff
batman-adv: Fix merge error.

I didn't resolve the merge properly during the last pull of the net
tree into net-next.

The code in the final resolution should set flags to TT_CLIENT_ROAM
not TT_CLIENT_PENDING.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/batman-adv/translation-table.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.