linux/net/batman-adv
David S. Miller d98cae64e4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/wireless/ath/ath9k/Kconfig
	drivers/net/xen-netback/netback.c
	net/batman-adv/bat_iv_ogm.c
	net/wireless/nl80211.c

The ath9k Kconfig conflict was a change of a Kconfig option name right
next to the deletion of another option.

The xen-netback conflict was overlapping changes involving the
handling of the notify list in xen_netbk_rx_action().

Batman conflict resolution provided by Antonio Quartulli, basically
keep everything in both conflict hunks.

The nl80211 conflict is a little more involved.  In 'net' we added a
dynamic memory allocation to nl80211_dump_wiphy() to fix a race that
Linus reported.  Meanwhile in 'net-next' the handlers were converted
to use pre and post doit handlers which use a flag to determine
whether to hold the RTNL mutex around the operation.

However, the dump handlers to not use this logic.  Instead they have
to explicitly do the locking.  There were apparent bugs in the
conversion of nl80211_dump_wiphy() in that we were not dropping the
RTNL mutex in all the return paths, and it seems we very much should
be doing so.  So I fixed that whilst handling the overlapping changes.

To simplify the initial returns, I take the RTNL mutex after we try
to allocate 'tb'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-19 16:49:39 -07:00
..
bat_algo.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
bat_iv_ogm.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-06-19 16:49:39 -07:00
bitarray.c batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
bitarray.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
bridge_loop_avoidance.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-06-19 16:49:39 -07:00
bridge_loop_avoidance.h batman-adv: change VID semantic in the BLA code 2013-05-29 02:44:55 +02:00
debugfs.c batman-adv: network coding - detect coding nodes and remove these after timeout 2013-03-13 22:53:49 +01:00
debugfs.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
distributed-arp-table.c batman-adv: fix typos in kernel doc & comments 2013-05-29 02:44:53 +02:00
distributed-arp-table.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
gateway_client.c batman-adv: use seq_puts instead of seq_printf when the format is constant 2013-03-27 10:29:55 +01:00
gateway_client.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
gateway_common.c batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
gateway_common.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
hard-interface.c batman-adv: don't initialise batman_iv private members in hard-interface.c 2013-05-29 02:44:54 +02:00
hard-interface.h batman-adv: Don't always delete softif when last slave was removed 2013-03-27 10:27:32 +01:00
hash.c batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
hash.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
icmp_socket.c batman-adv: don't deal with NET_IP_ALIGN manually 2013-05-29 02:44:54 +02:00
icmp_socket.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
Kconfig batman-adv: network coding - add the initial infrastructure code 2013-03-13 22:53:48 +01:00
main.c batman-adv: Avoid double freeing of bat_counters 2013-05-21 21:34:36 +02:00
main.h batman-adv: Start new development cycle 2013-05-29 02:44:56 +02:00
Makefile batman-adv: move ring_buffer helper functions in bat_iv_ogm 2013-05-29 02:44:54 +02:00
network-coding.c batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c 2013-05-29 02:44:55 +02:00
network-coding.h batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c 2013-05-29 02:44:55 +02:00
originator.c batman-adv: slightly improve neighbor creation debug message 2013-05-29 02:44:53 +02:00
originator.h batman-adv: drop useless argument seqno in neighbor creation 2013-05-29 02:44:53 +02:00
packet.h batman-adv: Fix endianness errors for network coding 2013-03-27 10:27:31 +01:00
routing.c batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c 2013-05-29 02:44:55 +02:00
routing.h batman-adv: move batadv_slide_own_bcast_window to bat_iv_ogm.c 2013-05-29 02:44:54 +02:00
send.c batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c 2013-05-29 02:44:55 +02:00
send.h batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c 2013-05-29 02:44:55 +02:00
soft-interface.c batman-adv: change VID semantic in the BLA code 2013-05-29 02:44:55 +02:00
soft-interface.h batman-adv: Allow to use rntl_link for device creation/deletion 2013-03-27 10:27:34 +01:00
sysfs.c batman-adv: wait for rtnl in batadv_store_mesh_iface instead of failing if it is taken 2013-06-10 08:42:16 +02:00
sysfs.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
translation-table.c batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c 2013-05-29 02:44:55 +02:00
translation-table.h batman-adv: pass a 16bit long flag argument to tt_global_add() 2013-05-29 02:44:55 +02:00
types.h batman-adv: change VID semantic in the BLA code 2013-05-29 02:44:55 +02:00
unicast.c batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c 2013-05-29 02:44:55 +02:00
unicast.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00
vis.c batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c 2013-05-29 02:44:55 +02:00
vis.h batman-adv: update copyright years 2013-01-19 21:18:12 +08:00