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

batman-adv: Calculate sizeof using variable insead of types

2011-05-30 07:39:33 +02:00

bat_debugfs.h

batman-adv: Update copyright years

2011-01-31 14:57:12 +01:00

bat_iv_ogm.c

batman-adv: agglomerate all batman iv ogm sending functions in the batman iv file

2011-09-08 17:44:41 +02:00

bat_ogm.h

batman-adv: agglomerate all batman iv ogm sending functions in the batman iv file

2011-09-08 17:44:41 +02:00

bat_sysfs.c

batman-adv: Replace obsolete strict_strto<foo> with kstrto<foo>

2011-11-20 13:08:31 +01:00

bat_sysfs.h

batman-adv: add wrapper function to throw uevent in userspace

2011-06-20 11:37:33 +02:00

bitarray.c

batman-adv: Fix range check for expected packets

2011-11-20 13:08:35 +01:00

bitarray.h

batman-adv: Reduce usage of char

2011-06-20 11:37:18 +02:00

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

batman-adv: Update copyright years

2011-01-31 14:57:12 +01:00

hard-interface.c

batman-adv: Remove unnecessary OOM logging messages

2011-09-08 17:52:30 +02:00

hard-interface.h

batman-adv: detect clients connected through a 802.11 device

2011-08-22 15:16:20 +02:00

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

batman-adv: Remove duplicate types.h inclusions

2011-02-11 23:30:29 +01:00

Kconfig

batman-adv: improved client announcement mechanism

2011-06-20 11:37:24 +02:00

main.c

batman-adv: Remove unnecessary OOM logging messages

2011-09-08 17:52:30 +02:00

main.h

batman-adv: update internal version number

2011-11-20 13:08:20 +01:00

Makefile

batman-adv: agglomerate all batman iv ogm sending functions in the batman iv file

2011-09-08 17:44:41 +02: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

batman-adv: rename all instances of batman_packet to batman_ogm_packet

2011-09-08 17:37:51 +02:00

ring_buffer.c

batman-adv: Add const type qualifier for pointers

2011-05-30 07:39:31 +02:00

ring_buffer.h

batman-adv: Add const type qualifier for pointers

2011-05-30 07:39:31 +02:00

routing.c

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

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

routing.h

batman-adv: agglomerate all batman iv ogm processing functions in a single file

2011-09-08 17:39:06 +02:00

send.c

batman-adv: agglomerate all batman iv ogm sending functions in the batman iv file

2011-09-08 17:44:41 +02:00

send.h

batman-adv: agglomerate all batman iv ogm sending functions in the batman iv file

2011-09-08 17:44:41 +02:00

soft-interface.c

batman-adv: use unregister_netdevice() when softif_create fails

2011-11-20 13:08:37 +01:00

soft-interface.h

batman-adv: Keep interface_tx as local function

2011-06-20 10:38:59 +02:00

translation-table.c

batman-adv: Fix merge error.

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

translation-table.h

batman-adv: merge update_transtable() into tt related code

2011-08-22 15:16:22 +02:00

types.h

batman-adv: create a common substructure for tt_global/local_entry

2011-11-20 13:08:35 +01:00

unicast.c

batman-adv: implement AP-isolation on the sender side

2011-08-22 15:16:21 +02:00

unicast.h

batman-adv: correct several typ0s in the comments

2011-08-22 15:16:19 +02:00

vis.c

batman-adv: create a common substructure for tt_global/local_entry

2011-11-20 13:08:35 +01:00

vis.h

batman-adv: Update copyright years

2011-01-31 14:57:12 +01:00