]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 05896fb) | 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)
commita69ebfe5fd6e26701f1905f519b5abeffb6dd4b7
tree06421abf3e8976395e37f2d42ae4c2e0f6662ec8tree | snapshot
parent05896fb3bd9c9cfc7d4d7962b9d426714f37dee2commit | 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
Linux Kernel Source Tree.