David S. Miller e62bc9e55f Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next ... John W. Linville says: ==================== Yet one more pull request for wireless updates intended for 3.11... For the mac80211 bits, Johannes says: "Here we have a few memory leak fixes related to BSS struct handling mostly from Ben, including a fix for a more theoretical problem (associating while a BSS struct times out) from myself, a compilation warning fix from Arend, mesh fixes from Thomas, tracking the beacon bitrate (Alex), a bandwidth change event fix (Ilan) and some initial work for 5/10 MHz channels from Simon." Regarding the iwlwifi bits, Johannes says: "Emmanuel removed some unneeded/unsupported module parameters and adds a Bluetooth 1x1 lookup-table for some upcoming products. From Alex I have an older patch to add low-power receive support, this depended on a mac80211 commit that only just came in with the merge from wireless-next I did. Ilan made beacon timings better, and Eytan added some debug statements for thermal throttling. I have a few cleanups, a fix for a long-standing but rare warning, and, arguably the most important patch here, the firmware API version bump for the 7260/3160 devices." Also included is a Bluetooth pull -- Gustavo says: "Here goes a set of patches to 3.11. The biggest work here is from Andre Guedes on the move of the Discovery to use the new request framework. Other than that Johan provided a bunch of fixes to the L2CAP code. The rest are just small fixes and clean ups." On top of all that, there are a variety of updates and fixes to brcmfmac, rt2x00, wil6210, ath9k, ath10k, and a few others here and there. This also includes a pull of the wireless tree, in order to prevent some merge conflicts. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-07-01 13:21:17 -07:00
..
9p	9p: turn fid->dlist into hlist	2013-02-27 22:51:08 -05:00
bluetooth	Bluetooth: Remove unneeded flag	2013-06-23 00:23:53 +01:00
caif	caif: Remove my bouncing email address.	2013-04-23 13:25:51 -04:00
irda	irda: small read past the end of array in debug code	2013-04-19 17:32:31 -04:00
iucv	af_iucv: fix recvmsg by replacing skb_pull() function	2013-04-08 17:16:57 -04:00
netfilter	net_sched: add 64bit rate estimators	2013-06-11 02:51:03 -07:00
netns	netfilter: {ipt,ebt}_ULOG: rise warning on deprecation	2013-05-23 14:23:16 +02:00
nfc	NFC: Add secure elements addition and removal API	2013-06-14 13:44:58 +02:00
phonet
sctp	net: sctp: migrate cookie life from timeval to ktime	2013-06-25 16:33:04 -07:00
tc_act
act_api.h	net_sched: add 64bit rate estimators	2013-06-11 02:51:03 -07:00
addrconf.h	ipv6: resend MLD report if a link-local address completes DAD	2013-06-28 21:19:17 -07:00
af_ieee802154.h
af_rxrpc.h
af_unix.h	af_unix: fix a fatal race with bit fields	2013-05-01 15:13:49 -04:00
ah.h
arp.h	net: Dont use ifindices in hash fns	2012-08-09 16:18:06 -07:00
atmclip.h
ax25.h	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
ax88796.h
cfg80211-wext.h
cfg80211.h	cfg80211: require passing BSS struct back to cfg80211_assoc_timeout	2013-06-19 18:55:39 +02:00
checksum.h	net: core: add function for incremental IPv6 pseudo header checksum updates	2012-08-30 03:00:16 +02:00
cipso_ipv4.h
cls_cgroup.h	cls_cgroup: remove task_struct parameter from sock_update_classid()	2013-04-09 13:19:35 -04:00
codel.h	codel: refine one condition to avoid a nul rec_inv_sqrt	2012-08-10 16:52:54 -07:00
compat.h
datalink.h
dcbevent.h
dcbnl.h
dn_dev.h
dn_fib.h	decnet: Parse netlink attributes on our own	2013-03-22 10:31:16 -04:00
dn_neigh.h
dn_nsp.h
dn_route.h	decnet: use correct RCU API to deref sk_dst_cache field	2013-01-28 00:15:27 -05:00
dn.h
dsa.h
dsfield.h	ipv6: Optimize ipv6_change_dsfield().	2013-01-09 23:59:53 -08:00
dst_ops.h	net: Fix warnings in dst_ops.h	2012-07-19 10:43:03 -07:00
dst.h	Fix dst_neigh_lookup/dst_neigh_lookup_skb return value handling bug	2013-03-15 09:06:58 -04:00
esp.h
ethoc.h
fib_rules.h
firewire.h	firewire net, ipv4 arp: Extend hardware address and remove driver-level packet inspection.	2013-03-26 12:32:13 -04:00
flow_keys.h	flow_keys: include thoff into flow_keys for later usage	2013-03-20 12:14:36 -04:00
flow.h	ipv4: Add FLOWI_FLAG_KNOWN_NH	2012-10-08 17:42:36 -04:00
garp.h
gen_stats.h	net_sched: add 64bit rate estimators	2013-06-11 02:51:03 -07:00
genetlink.h	genl: Allow concurrent genl callbacks.	2013-04-25 01:43:15 -04:00
gre.h	gre: export gre_handle_offloads() function.	2013-06-19 18:07:41 -07:00
gro_cells.h	gro: Fix kcalloc argument order	2013-01-27 22:46:33 -05:00
icmp.h	ipv4: fix error handling in icmp_protocol.	2013-02-22 15:10:18 -05:00
ieee80211_radiotap.h	mac80211: add STBC flag for radiotap	2013-05-24 12:07:25 +02:00
ieee802154_netdev.h	ieee802154/nl-mac.c: make some MLME operations optional	2013-04-08 12:00:16 -04:00
ieee802154.h
if_inet6.h	ipv6: resend MLD report if a link-local address completes DAD	2013-06-28 21:19:17 -07:00
inet6_connection_sock.h	ipv6: Add helper inet6_csk_update_pmtu().	2012-07-16 03:44:56 -07:00
inet6_hashtables.h	ipv6: use a stronger hash for tcp	2013-02-21 18:15:58 -05:00
inet_common.h	net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)	2012-07-19 11:02:03 -07:00
inet_connection_sock.h	tcp: Tail loss probe (TLP)	2013-03-12 08:30:34 -04:00
inet_ecn.h	net: Correct comparisons and calculations using skb->tail and skb-transport_header	2013-05-28 23:49:07 -07:00
inet_frag.h	net: frag, fix race conditions in LRU list maintenance	2013-05-06 11:06:51 -04:00
inet_hashtables.h	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
inet_sock.h	ipv4: remove is_data also from ip_options documentation.	2013-06-12 03:13:50 -07:00
inet_timewait_sock.h	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
inetpeer.h
ip6_checksum.h	ipv6: move csum_ipv6_magic() and udp6_csum_init() into static library	2013-01-08 17:56:10 -08:00
ip6_fib.h	ipv6: fix race condition regarding dst->expires and dst->from.	2013-02-20 15:11:45 -05:00
ip6_route.h	ipv6: Remove unused neigh argument for icmp6_dst_alloc() and its callers.	2013-01-18 14:41:13 -05:00
ip6_tunnel.h	GRE: Refactor GRE tunneling code.	2013-03-26 12:27:18 -04:00
ip_fib.h	ipv4: use next hop exceptions also for input routes	2013-06-28 21:27:47 -07:00
ip_tunnels.h	sit: add support of x-netns	2013-06-27 22:30:47 -07:00
ip_vs.h	ipvs: add sync_persist_mode flag	2013-06-26 18:01:46 +09:00
ip.h	ipv4: Add a socket release callback for datagram sockets	2013-01-21 14:17:05 -05:00
ipcomp.h
ipconfig.h
ipv6.h	ipv6: Convert use of typedef ctl_table to struct ctl_table	2013-06-19 23:18:07 -07:00
ipx.h
iw_handler.h
lapb.h
lib80211.h	hostap: Don't use create_proc_read_entry()	2013-04-29 15:41:56 -04:00
ll_poll.h	net: poll/select low latency socket support	2013-06-25 16:35:52 -07:00
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
llc.h	llc: Remove stray reference to sysctl_llc_station_ack_timeout.	2012-09-17 13:13:24 -04:00
mac80211.h	mac80211: track AP's beacon rate and give it to the driver	2013-06-13 11:58:47 +02:00
mac802154.h
mip6.h
mld.h
mrp.h	net/802: Implement Multiple Registration Protocol (MRP)	2013-02-10 20:37:22 -05:00
ndisc.h	ndisc: Convert use of typedef ctl_table to struct ctl_table	2013-06-19 23:18:07 -07:00
neighbour.h	net neighbour, decnet: Ensure to align device private data on preferred alignment.	2013-02-11 00:21:44 -05:00
net_namespace.h	netns: exclude ipvs from struct net when IPVS disabled	2013-06-26 18:01:46 +09:00
net_ratelimit.h
netdma.h
netevent.h	ipv6 netevent: Remove old_neigh from netevent_redirect.	2013-01-14 15:04:59 -05:00
netlabel.h	userns: Convert the audit loginuid to be a kuid	2012-09-17 18:08:54 -07:00
netlink.h	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
netprio_cgroup.h	netprio_cgroup: remove task_struct parameter from sock_update_netprio()	2013-04-09 13:19:37 -04:00
netrom.h	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
nexthop.h
nl802154.h
p8022.h
ping.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-06-05 16:37:30 -07:00
pkt_cls.h	pkt_sched: namespace aware act_mirred	2013-01-14 15:09:36 -05:00
pkt_sched.h	sch_api: introduce qdisc_watchdog_schedule_ns()	2013-02-12 18:59:45 -05:00
protocol.h	net: Remove code duplication between offload structures	2012-11-15 17:39:51 -05:00
psnap.h
raw.h
rawv6.h
red.h
regulatory.h	regulatory: use RCU to protect last_request	2013-01-03 13:01:30 +01:00
request_sock.h	net: remove a stale comment for dl_next	2013-04-22 15:55:48 -04:00
rose.h
route.h	ipv4: avoid a test in ip_rt_put()	2012-11-03 14:59:04 -04:00
rtnetlink.h	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
sch_generic.h	net_sched: psched_ratecfg_precompute() improvements	2013-06-11 22:39:47 -07:00
scm.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
secure_seq.h	net: defer net_secret[] initialization	2013-04-29 15:14:02 -04:00
slhc_vj.h
snmp.h	net: avoid reloads in SNMP_UPD_PO_STATS	2012-08-06 13:40:47 -07:00
sock.h	net: sock: adapt SOCK_MIN_RCVBUF and SOCK_MIN_SNDBUF	2013-06-19 21:16:53 -07:00
stp.h
tcp_memcontrol.h
tcp_states.h
tcp.h	tcp: remove invalid __rcu annotation	2013-06-25 02:44:05 -07:00
timewait_sock.h
transp_v6.h	transp_v6.h: style neatening	2013-06-04 16:43:42 -07:00
udp.h	net: udp4: move GSO functions to udp_offload	2013-06-12 00:47:25 -07:00
udplite.h
wext.h
wimax.h
wpan-phy.h
x25.h
x25device.h
xfrm.h	xfrm: force a garbage collection after deleting a policy	2013-05-31 17:30:07 -07:00