John W. Linville
777bf135b7
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem ...
John W. Linville says:
====================
Please pull these fixes intended for 3.6. There are more commits
here than I would like -- I got a bit behind while I was stalking
Steven Rostedt in San Diego last week... I'll slow it down after this!
There are a couple of pulls here. One is from Johannes:
"Please pull (according to the below information) to get a few fixes.
* a fix to properly disconnect in the driver when authentication or
association fails
* a fix to prevent invalid information about mesh paths being reported
to userspace
* a memory leak fix in an nl80211 error path"
The other comes via Gustavo:
"A few updates for the 3.6 kernel. There are two btusb patches to add
more supported devices through the new USB_VENDOR_AND_INTEFACE_INFO()
macro and another one that add a new device id for a Sony Vaio laptop,
one fix for a user-after-free and, finally, two patches from Vinicius
to fix a issue in SMP pairing."
Along with those...
Arend van Spriel provides a fix for a use-after-free bug in brcmfmac.
Daniel Drake avoids a hang by not trying to touch the libertas hardware
duing suspend if it is already powered-down.
Felix Fietkau provides a batch of ath9k fixes that adress some
potential problems with power settings, as well as a fix to avoid a
potential interrupt storm.
Gertjan van Wingerde provides a register-width fix for rt2x00, and
a rt2x00 fix to prevent incorrectly detecting the rfkill status.
He also provides a device ID patch.
Hante Meuleman gives us three brcmfmac fixes, one that properly
initializes a command structure, one that fixes a race condition that
could lose usb requests, and one that removes some log spam.
Marc Kleine-Budde offers an rt2x00 fix for a voltage setting on some
specific devices.
Mohammed Shafi Shajakhan sent an ath9k fix to avoid a crash related to
using timers that aren't allocated when 2 wire bluetooth coexistence
hardware is in use.
Sergei Poselenov changes rt2800usb to do some validity checking for
received packets, avoiding crashes on an ARM Soc.
Stone Piao gives us an mwifiex fix for an incorrectly set skb length
value for a command buffer.
All of these are localized to their specific drivers, and relatively
small. The power-related patches from Felix are bigger than I would
like, but I merged them in consideration of their isolation to ath9k
and the sensitive nature of power settings in wireless devices.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-07 14:38:50 -04:00
9p: Reduce object size with CONFIG_NET_9P_DEBUG
2012-01-05 10:51:44 -06:00
Bluetooth: Change signature of smp_conn_security()
2012-08-27 08:07:18 -07:00
caif-hsi: Remove use of module parameters
2012-06-25 16:44:12 -07:00
af_iucv: add shutdown for HS transport
2012-03-07 22:52:24 -08:00
netfilter: nf_conntrack: fix racy timer handling with reliable events
2012-08-31 15:50:28 +02:00
ipv4: remove rt_cache_rebuild_count
2012-07-30 14:53:22 -07:00
NFC: Allow HCI driver to pre-open pipes to some gates
2012-07-09 16:42:12 -04:00
net: remove my future former mail address
2012-06-17 16:29:38 -07:00
sctp: Implement quick failover draft from tsvwg
2012-07-22 12:13:46 -07:00
ipv6: add ipv6_addr_hash() helper
2012-07-18 11:28:46 -07:00
af_unix: speedup /proc/net/unix
2012-06-08 14:27:23 -07:00
ipv4: Fix neigh lookup keying over loopback/point-to-point devices.
2012-07-20 16:06:10 -07:00
atm: clip: Use device neigh support on top of "arp_tbl".
2011-11-30 18:51:03 -05:00
net ax25: Fix the build when sysctl support is disabled.
2012-04-23 22:14:47 -04:00
cfg80211: add channel flag to prohibit OFDM operation
2012-08-02 15:30:49 +02:00
cipso: handle CIPSO options correctly when NetLabel is disabled
2012-06-01 14:18:29 -04:00
codel: refine one condition to avoid a nul rec_inv_sqrt
2012-08-10 16:52:54 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net/dcb: Add an optional max rate attribute
2012-04-05 05:08:04 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
decnet: Use neighbours privately in dn_route struct.
2012-07-05 01:12:14 -07:00
dsa: Include linux/if_ether.h to fix build error
2011-12-01 11:41:06 -05:00
net: force dst_default_metrics to const section
2012-08-08 16:00:28 -07: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
ipv4: Kill FLOWI_FLAG_RT_NOCACHE and associated code.
2012-07-20 13:36:54 -07:00
flow_dissector: use a 64bit load/store
2011-11-29 13:17:03 -05:00
net: Use NLMSG_DEFAULT_SIZE in combination with nlmsg_new()
2012-06-28 17:56:43 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
wireless: move ieee80211chan2mhz macro
2011-11-11 12:32:50 -05:00
6LoWPAN: add fragmentation support
2011-11-14 00:19:42 -05:00
mac802154: declare reduced mlme operations
2012-05-16 15:16:56 -04:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
ipv6: Add helper inet6_csk_update_pmtu().
2012-07-16 03:44:56 -07:00
ipv6: Early TCP socket demux
2012-07-26 15:50:39 -07:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
net: ipv6: fix TCP early demux
2012-08-06 13:33:21 -07:00
ip_frag: struct inet_frags match() method returns a bool
2012-05-18 01:40:27 -04:00
ipv4: Early TCP socket demux.
2012-06-19 21:22:05 -07:00
net: ipv6: fix TCP early demux
2012-08-06 13:33:21 -07:00
inet: remove rcu protection on tw_net
2011-12-14 13:34:55 -05:00
ipv4: Maintain redirect and PMTU info in struct rtable again.
2012-07-10 22:40:14 -07:00
ipv4: fix ip_send_skb()
2012-08-10 14:08:57 -07:00
ipv6: Store route neighbour in rt6_info struct.
2012-07-05 02:41:58 -07:00
ipv6: fix inet6_csk_xmit()
2012-07-18 08:59:58 -07:00
ipv6_tunnel: Allow receiving packets on the fallback tunnel if they pass sanity checks
2012-06-29 00:52:32 -07:00
ipv4: Cache routes in nexthop exception entries.
2012-07-31 15:02:02 -07:00
ipvs: fix oops on NAT reply in br_nf context
2012-07-17 12:00:46 +02:00
tunnel: implement 64 bits statistics
2012-04-14 14:47:05 -04:00
ipv6: add ipv6_addr_hash() helper
2012-07-18 11:28:46 -07:00
lapb: Neaten debugging
2012-05-17 18:45:20 -04:00
llc2: Fix silent failure of llc_station_init()
2012-08-14 16:51:18 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
mac80211: add time synchronisation with BSS for assoc
2012-07-12 12:10:46 +02:00
mac802154: add wpan device-class support
2012-06-26 21:06:11 -07:00
ipv6: Export ndisc option parsing from ndisc.c
2012-07-11 23:39:11 -07:00
net: Do delayed neigh confirmation.
2012-07-05 01:03:06 -07:00
net: make sock diag per-namespace
2012-07-16 22:31:34 -07:00
net: Pass neighbours and dest address into NETEVENT_REDIRECT events.
2012-07-05 02:21:55 -07:00
netlink: Delete all NLA_PUT*() macros.
2012-04-02 04:33:45 -04:00
net: netprio_cgroup: rework update socket logic
2012-07-22 12:44:01 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ipv6: Early TCP socket demux
2012-07-26 15:50:39 -07:00
ipv6: bool/const conversions phase2
2012-05-19 01:08:16 -04:00
net_sched: red: Make minor corrections to comments
2012-04-16 23:53:11 -04:00
cfg80211: add cellular base station regulatory hint support
2012-07-17 12:16:39 +02:00
ipv4: Properly purge netdev references on uncached routes.
2012-07-31 15:06:50 -07:00
rtnl: allow to specify different num for rx and tx queue count
2012-07-20 11:06:59 -07:00
net: rename bond_queue_mapping to slave_dev_queue_mapping
2012-07-20 11:07:00 -07:00
af_netlink: force credentials passing [CVE-2012-3520]
2012-08-21 14:53:01 -07:00
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2012-01-09 13:08:28 -08:00
tcp: Apply device TSO segment limit earlier
2012-08-02 00:19:17 -07:00
net: tcp: ipv6_mapped needs sk_rx_dst_set method
2012-08-09 20:56:09 -07:00
cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg
2012-04-10 10:04:07 -07:00
[PATCH] tcp: Cache inetpeer in timewait socket, and only when necessary.
2012-06-09 14:56:12 -07:00
net/ipv6/udp: UDP encapsulation: introduce encap_rcv hook into IPv6
2012-04-28 22:21:51 -04:00
net: ipv4: Standardize prefixes for message logging
2012-03-12 17:05:21 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
mac802154: monitor device support
2012-05-16 15:17:08 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
xfrm: Workaround incompatibility of ESN and async crypto
2012-09-04 14:09:45 -04:00
777bf135b7