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
9p: turn fid->dlist into hlist
2013-02-27 22:51:08 -05:00
Bluetooth: Fix mgmt handling of power on failures
2013-06-12 10:20:55 -04:00
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
irda: small read past the end of array in debug code
2013-04-19 17:32:31 -04:00
af_iucv: fix recvmsg by replacing skb_pull() function
2013-04-08 17:16:57 -04:00
net_sched: add 64bit rate estimators
2013-06-11 02:51:03 -07:00
netfilter: {ipt,ebt}_ULOG: rise warning on deprecation
2013-05-23 14:23:16 +02:00
NFC: RFKILL support
2013-04-12 16:54:45 +02:00
net: remove my future former mail address
2012-06-17 16:29:38 -07:00
net: sctp: remove SCTP_STATIC macro
2013-06-17 17:08:05 -07:00
net_sched: add 64bit rate estimators
2013-06-11 02:51:03 -07:00
netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6
2013-05-23 11:58:55 +02:00
af_unix: fix a fatal race with bit fields
2013-05-01 15:13:49 -04:00
net: Dont use ifindices in hash fns
2012-08-09 16:18:06 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
cfg80211: remove cleanup_work kernel-doc
2013-05-29 09:11:57 +02:00
net: core: add function for incremental IPv6 pseudo header checksum updates
2012-08-30 03:00:16 +02:00
cipso: handle CIPSO options correctly when NetLabel is disabled
2012-06-01 14:18:29 -04:00
cls_cgroup: remove task_struct parameter from sock_update_classid()
2013-04-09 13:19:35 -04:00
codel: refine one condition to avoid a nul rec_inv_sqrt
2012-08-10 16:52:54 -07:00
decnet: Parse netlink attributes on our own
2013-03-22 10:31:16 -04:00
decnet: use correct RCU API to deref sk_dst_cache field
2013-01-28 00:15:27 -05:00
ipv6: Optimize ipv6_change_dsfield().
2013-01-09 23:59:53 -08:00
Fix dst_neigh_lookup/dst_neigh_lookup_skb return value handling bug
2013-03-15 09:06:58 -04:00
net: Fix warnings in dst_ops.h
2012-07-19 10:43:03 -07:00
ipv4: Elide fib_validate_source() completely when possible.
2012-06-29 01:36:36 -07:00
firewire net, ipv4 arp: Extend hardware address and remove driver-level packet inspection.
2013-03-26 12:32:13 -04:00
ipv4: Add FLOWI_FLAG_KNOWN_NH
2012-10-08 17:42:36 -04:00
flow_keys: include thoff into flow_keys for later usage
2013-03-20 12:14:36 -04:00
net_sched: add 64bit rate estimators
2013-06-11 02:51:03 -07:00
genl: Allow concurrent genl callbacks.
2013-04-25 01:43:15 -04:00
GRE: Refactor GRE tunneling code.
2013-03-26 12:27:18 -04:00
gro: Fix kcalloc argument order
2013-01-27 22:46:33 -05:00
ipv4: fix error handling in icmp_protocol.
2013-02-22 15:10:18 -05:00
mac80211: add STBC flag for radiotap
2013-05-24 12:07:25 +02:00
ieee802154/nl-mac.c: make some MLME operations optional
2013-04-08 12:00:16 -04:00
net: ipv6: remove 'next' member from inet6_dev
2013-05-20 13:49:48 -07:00
ipv6: Add helper inet6_csk_update_pmtu().
2012-07-16 03:44:56 -07:00
ipv6: use a stronger hash for tcp
2013-02-21 18:15:58 -05:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
tcp: Tail loss probe (TLP)
2013-03-12 08:30:34 -04:00
net: Correct comparisons and calculations using skb->tail and skb-transport_header
2013-05-28 23:49:07 -07:00
net: frag, fix race conditions in LRU list maintenance
2013-05-06 11:06:51 -04:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
ipv4: remove is_data also from ip_options documentation.
2013-06-12 03:13:50 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
ipv4: Maintain redirect and PMTU info in struct rtable again.
2012-07-10 22:40:14 -07:00
ipv4: Add a socket release callback for datagram sockets
2013-01-21 14:17:05 -05:00
ipv6: move csum_ipv6_magic() and udp6_csum_init() into static library
2013-01-08 17:56:10 -08:00
ipv6: fix race condition regarding dst->expires and dst->from.
2013-02-20 15:11:45 -05:00
ipv6: Remove unused neigh argument for icmp6_dst_alloc() and its callers.
2013-01-18 14:41:13 -05:00
GRE: Refactor GRE tunneling code.
2013-03-26 12:27:18 -04:00
ipv4: use separate genid for next hop exceptions
2013-06-03 00:07:43 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-06-19 16:49:39 -07:00
ipvs: change type of netns_ipvs->sysctl_sync_qlen_max
2013-05-26 08:17:33 +09:00
net: ipv6: Add IPv6 support to the ping socket.
2013-05-25 21:07:49 -07:00
hostap: Don't use create_proc_read_entry()
2013-04-29 15:41:56 -04:00
net: add socket option for low latency polling
2013-06-17 15:48:14 -07:00
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
2012-09-17 13:13:24 -04:00
Merge remote-tracking branch 'mac80211/master' into mac80211-next
2013-05-25 00:01:30 +02:00
mac802154: add wpan device-class support
2012-06-26 21:06:11 -07:00
net/802: Implement Multiple Registration Protocol (MRP)
2013-02-10 20:37:22 -05:00
ndisc: Move ndisc_opt_addr_space() to include/net/ndisc.h.
2013-01-21 13:33:14 -05:00
net neighbour, decnet: Ensure to align device private data on preferred alignment.
2013-02-11 00:21:44 -05:00
ipv4: use separate genid for next hop exceptions
2013-06-03 00:07:43 -07:00
ipv6 netevent: Remove old_neigh from netevent_redirect.
2013-01-14 15:04:59 -05:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netprio_cgroup: remove task_struct parameter from sock_update_netprio()
2013-04-09 13:19:37 -04:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-06-05 16:37:30 -07:00
pkt_sched: namespace aware act_mirred
2013-01-14 15:09:36 -05:00
sch_api: introduce qdisc_watchdog_schedule_ns()
2013-02-12 18:59:45 -05:00
net: Remove code duplication between offload structures
2012-11-15 17:39:51 -05:00
regulatory: use RCU to protect last_request
2013-01-03 13:01:30 +01:00
net: remove a stale comment for dl_next
2013-04-22 15:55:48 -04:00
ipv4: avoid a test in ip_rt_put()
2012-11-03 14:59:04 -04:00
rtnetlink: Remove passing of attributes into rtnl_doit functions
2013-03-22 10:31:16 -04:00
net_sched: psched_ratecfg_precompute() improvements
2013-06-11 22:39:47 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-22 20:32:51 -04:00
net: defer net_secret[] initialization
2013-04-29 15:14:02 -04:00
net: avoid reloads in SNMP_UPD_PO_STATS
2012-08-06 13:40:47 -07:00
net: add socket option for low latency polling
2013-06-17 15:48:14 -07:00
tcp: properly send new data in fast recovery in first RTT
2013-06-13 02:46:29 -07:00
[PATCH] tcp: Cache inetpeer in timewait socket, and only when necessary.
2012-06-09 14:56:12 -07:00
transp_v6.h: style neatening
2013-06-04 16:43:42 -07:00
net: udp4: move GSO functions to udp_offload
2013-06-12 00:47:25 -07:00
xfrm: force a garbage collection after deleting a policy
2013-05-31 17:30:07 -07:00
d98cae64e4