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)
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>

No differences found