diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-16 20:07:28 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-16 20:07:28 (GMT) |
| commit | 220b07e90e3b7b3adc60b8a72c79ad4465312072 (patch) | |
| tree | 06421abf3e8976395e37f2d42ae4c2e0f6662ec8 /drivers/net/ethernet | |
| parent | 278bc4296bd64ffd1d3913b487dc8a520e423a7a (diff) | |
| download | linux-fsl-qoriq-220b07e90e3b7b3adc60b8a72c79ad4465312072.tar.xz | |
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>
Diffstat (limited to 'drivers/net/ethernet')
0 files changed, 0 insertions, 0 deletions