David S. Miller 220b07e90e 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>

2011-12-16 15:07:28 -05:00

..

bat_debugfs.c

…

bat_debugfs.h

…

bat_iv_ogm.c

…

bat_ogm.h

…

bat_sysfs.c

…

bat_sysfs.h

…

bitarray.c

…

bitarray.h

…

gateway_client.c

…

gateway_client.h

…

gateway_common.c

…

gateway_common.h

…

hard-interface.c

…

hard-interface.h

…

hash.c

…

hash.h

…

icmp_socket.c

batman-adv: Only write requested number of byte to user buffer

2011-12-12 19:11:07 +08:00

icmp_socket.h

…

Kconfig

…

main.c

…

main.h

…

Makefile

…

originator.c

…

originator.h

…

packet.h

…

ring_buffer.c

…

ring_buffer.h

…

routing.c

batman-adv: format multi-line if in the correct way

2011-12-07 02:45:59 +08:00

routing.h

…

send.c

…

send.h

…

soft-interface.c

…

soft-interface.h

…

translation-table.c

batman-adv: Fix merge error.

2011-12-16 15:07:28 -05:00

translation-table.h

…

types.h

…

unicast.c

…

unicast.h

…

vis.c

…

vis.h

…