snowball/igloo-kernel.git/net/batman-adv, branch 2011.09Igloo kernelhttps://git.etezian.org/cgit.cgi/snowball/igloo-kernel.git/atom?h=2011.092011-05-20T20:43:21+00:00Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.62011-05-20T20:43:21+00:00Linus Torvaldstorvalds@linux-foundation.org2011-05-20T20:43:21+00:00urn:sha1:06f4e926d256d902dd9a53dcb400fd74974ce087
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
macvlan: fix panic if lowerdev in a bond
tg3: Add braces around 5906 workaround.
tg3: Fix NETIF_F_LOOPBACK error
macvlan: remove one synchronize_rcu() call
networking: NET_CLS_ROUTE4 depends on INET
irda: Fix error propagation in ircomm_lmp_connect_response()
irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
be2net: Kill set but unused variable 'req' in lancer_fw_download()
irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
isdn: capi: Use pr_debug() instead of ifdefs.
tg3: Update version to 3.119
tg3: Apply rx_discards fix to 5719/5720
...
Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge2011-05-15T02:47:51+00:00David S. Millerdavem@conan.davemloft.net2011-05-15T02:47:51+00:00urn:sha1:4dc6ec26fe7d9f89349d4c0c654e2f07420f4b27batman-adv: reset broadcast flood protection on error2011-05-14T22:02:06+00:00Marek Lindnerlindner_marek@yahoo.de2011-05-14T18:01:22+00:00urn:sha1:ca06c6eb9a31ae782e74596231fb23df4fc5e46d
The broadcast flood protection should be reset to its original value
if the primary interface could not be retrieved.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv: Add missing hardif_free_ref in forw_packet_free2011-05-14T22:02:06+00:00Sven Eckelmannsven@narfation.org2011-05-11T18:59:06+00:00urn:sha1:6d5808d4ae1b0851c3b732d9ec2860d5f7804294
add_bcast_packet_to_list increases the refcount for if_incoming but the
reference count is never decreased. The reference count must be
increased for all kinds of forwarded packets which have the primary
interface stored and forw_packet_free must decrease them. Also
purge_outstanding_packets has to invoke forw_packet_free when a work
item was really cancelled.
This regression was introduced in
32ae9b221e788413ce68feaae2ca39e406211a0a.
Reported-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge2011-05-08T22:39:11+00:00David S. Millerdavem@davemloft.net2011-05-08T22:39:11+00:00urn:sha1:02e73c1edc3746e308d1768a27fdc8121f641ab1batman-adv: remove duplicate code from function is_bidirectional_neigh()2011-05-08T14:10:42+00:00Daniele Furlandaniele.furlan@gmail.com2011-05-07T20:45:19+00:00urn:sha1:27aea2128ec09924dfe08e97739b2bf8b15c8619
In function is_bidirectional_neigh the code that find out the one hop
neighbor is duplicated.
Signed-off-by: Daniele Furlan <daniele.furlan@gmail.com>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv: Remove multiline comments from line ending2011-05-08T14:10:42+00:00Sven Eckelmannsven@narfation.org2011-05-08T10:45:45+00:00urn:sha1:6e215fd8eb4930373d01da0fac16a0889804fac3
It is slightly irritating that comments after a long line span over
multiple lines without any code. It is easier to put them before the
actual code and reduce the number of lines which the eye has to read.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv: rename everything from *hna* into *tt* (translation table)2011-05-08T14:10:42+00:00Antonio Quartulliordex@autistici.org2011-05-05T06:42:45+00:00urn:sha1:2dafb49d84a9195193b28ac5047df1bbab6053b9
To be coherent, all the functions/variables/constants have been renamed
to the TranslationTable style
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv: Fix refcount imbalance in find_router2011-05-08T14:10:42+00:00Marek Lindnerlindner_marek@yahoo.de2011-05-05T12:14:46+00:00urn:sha1:01df2b65e97735547ce37844f4134b5ea99b4037
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
batman-adv: Avoid deadlock between rtnl_lock and s_active2011-05-08T14:10:42+00:00Sven Eckelmannsven@narfation.org2011-05-03T11:10:06+00:00urn:sha1:3a4375a9f0080e6ae40af63e2e2c1e70a6dcb775
The hard_if_event is called by the notifier with rtnl_lock and tries to
remove sysfs entries when a NETDEV_UNREGISTER event is received. This
will automatically take the s_active lock.
The s_active lock is also used when a new interface is added to a meshif
through sysfs. In that situation we cannot wait for the rntl_lock before
creating the actual batman-adv interface to prevent a deadlock. It is
still possible to try to get the rtnl_lock and immediately abort the
current operation when the trylock call failed.
Signed-off-by: Sven Eckelmann <sven@narfation.org>