| commit | 220b07e90e3b7b3adc60b8a72c79ad4465312072 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Dec 16 15:07:28 2011 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Dec 16 15:07:28 2011 -0500 |
| tree | 06421abf3e8976395e37f2d42ae4c2e0f6662ec8 | |
| parent | 278bc4296bd64ffd1d3913b487dc8a520e423a7a [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>