original_kernel/net/batman-adv
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
..
Kconfig
Makefile
bat_debugfs.c
bat_debugfs.h
bat_iv_ogm.c
bat_ogm.h
bat_sysfs.c batman-adv: Replace obsolete strict_strto<foo> with kstrto<foo> 2011-11-20 13:08:31 +01:00
bat_sysfs.h
bitarray.c batman-adv: Fix range check for expected packets 2011-11-20 13:08:35 +01:00
bitarray.h
gateway_client.c batman-adv: remove extra negation in gw_out_of_range() 2011-12-07 02:45:59 +08:00
gateway_client.h batman-adv: refactoring gateway handling code 2011-11-20 13:08:32 +01:00
gateway_common.c batman-adv: Replace obsolete strict_strto<foo> with kstrto<foo> 2011-11-20 13:08:31 +01:00
gateway_common.h
hard-interface.c
hard-interface.h
hash.c batman-adv: fixed hash functions type to uint32_t instead of int 2011-11-20 13:08:33 +01:00
hash.h batman-adv: fixed hash functions type to uint32_t instead of int 2011-11-20 13:08:33 +01:00
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
main.c
main.h batman-adv: update internal version number 2011-11-20 13:08:20 +01:00
originator.c batman-adv: fixed hash functions type to uint32_t instead of int 2011-11-20 13:08:33 +01:00
originator.h batman-adv: fixed hash functions type to uint32_t instead of int 2011-11-20 13:08:33 +01:00
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 batman-adv: use unregister_netdevice() when softif_create fails 2011-11-20 13:08:37 +01:00
soft-interface.h
translation-table.c batman-adv: Fix merge error. 2011-12-16 15:07:28 -05:00
translation-table.h
types.h batman-adv: create a common substructure for tt_global/local_entry 2011-11-20 13:08:35 +01:00
unicast.c
unicast.h
vis.c batman-adv: create a common substructure for tt_global/local_entry 2011-11-20 13:08:35 +01:00
vis.h