David S. Miller
e7abfe4092
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next ...
John W. Linville says:
====================
Please accept this batch of updates intended for the 3.12 stream.
For the mac80211 bits, Johannes says this:
"This time I have various improvements all over the place: IBSS, mesh,
testmode, AP client powersave handling, one of the rare rfkill patches
and some code cleanup."
Also for mac80211:
"And I also have some more changes for -next, just a few small fixes and
improvements, nothing really stands out."
And for iwlwifi:
"This time I have some powersave work (notably uAPSD support), CQM
offloads, support for a new firmware API and various code cleanups."
Regarding the Bluetooth bits, Gustavo says:
"Patches to 3.12, here we have:
* implementation of a proper tty_port for RFCOMM devices, this fixes some
issues people were seeing lately in the kernel.
* Add voice_setting option for SCO, it is used for SCO Codec selection
* bugfixes, small improvements and clean ups"
For the NFC bits, Samuel says:
"With this one we have:
- A few pn533 improvements and minor fixes. Testing our pn533 driver
against Google's NCI stack triggered a few issues that we fixed now.
We also added Tx fragmentation support to this driver.
- More NFC secure element handling. We added a GET_SE netlink command
for getting all the discovered secure elements, and we defined 2
additional secure element netlink event (transaction and connectivity).
We also fixed a couple of typos and copy-paste bugs from the secure
element handling code.
- Firmware download support for the pn544 driver. This chipset can enter a
special mode where it's waiting for firmware blobs to replace the
already flashed one. We now support that mode."
With repect to the ath tree, Kalle says:
"New features in ath10k are rx/tx checsumming in hw and survey scan
implemented by Michal. Also he made fixes to different areas of the
driver, most notable being fixing the case when using two streams and
reducing the number of interface combinations to avoid firmware crashes.
Bartosz did a clean related to how we handle SoC power save in PCI
layer.
For ath6kl Mohammed and Vasanth sent each a patch to fix two infrequent
crashes."
I also pulled the wireless tree into wireless-next to support a
request from Johannes. On top of all that, there are the usual
sort of driver updates. The mwifiex, brcmfmac, brcmsmac, ath9k,
and rt2x00 drivers all get some attention, as does the bcma bus and
a few other random bits here and there.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-09-03 21:45:31 -04:00
9p: client: remove unused code and any reference to "cancelled" function
2013-07-30 15:54:28 -07:00
Bluetooth: Add SCO connection fallback
2013-08-21 16:47:13 +02:00
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
include: Convert ethernet mac address declarations to use ETH_ALEN
2013-08-02 12:33:54 -07:00
af_iucv: fix recvmsg by replacing skb_pull() function
2013-04-08 17:16:57 -04:00
netfilter: add SYNPROXY core/target
2013-08-28 00:27:54 +02:00
Revert "net: sctp: convert sctp_checksum_disable module param into sctp sysctl"
2013-08-09 13:09:41 -07:00
NFC: netlink: Add result of firmware operation to completion event
2013-08-14 01:12:58 +02:00
net: remove my future former mail address
2012-06-17 16:29:38 -07:00
net: sctp: reorder sctp_globals to reduce cacheline usage
2013-08-29 14:55:54 -04:00
net: Remove extern from include/net/ scheduling prototypes
2013-07-31 17:24:22 -07:00
vxlan: add ipv6 proxy support
2013-08-31 22:30:01 -04:00
af_rxrpc.h: Remove extern from function prototypes
2013-07-31 17:50:01 -07:00
af_unix: improve STREAM behavior with fragmented memory
2013-08-10 01:16:44 -07:00
VSOCK: Move af_vsock.h and vsock_addr.h to include/net
2013-07-27 22:14:06 -07:00
arp/neighbour.h: Remove extern from function prototypes
2013-07-31 17:50:02 -07:00
atm: clip: Use device neigh support on top of "arp_tbl".
2011-11-30 18:51:03 -05:00
ax25.h: Remove extern from function prototypes
2013-07-31 17:50:02 -07:00
net: rename busy poll MIB counter
2013-08-09 11:39:08 -07:00
cfg80211: remove unused wext handler exports
2011-08-08 14:26:29 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-08-29 14:08:24 -04:00
checksum: Remove extern from function prototypes
2013-07-31 17:50:02 -07:00
cipso: handle CIPSO options correctly when NetLabel is disabled
2012-06-01 14:18:29 -04:00
cls_cgroup.h netprio_cgroup.h: Remove extern from function prototypes
2013-07-31 17:50:02 -07: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
dcb: Add stub routines for !CONFIG_DCB
2011-10-06 15:49:51 -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
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
dsa: Include linux/if_ether.h to fix build error
2011-12-01 11:41:06 -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
fib_rules: reorder struct fib_rules fields
2013-08-03 11:53:54 -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
net: gre: move GSO functions to gre_offload
2013-07-03 14:37:39 -07: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 radiotap flag and handling for 5/10 MHz
2013-07-16 09:58:05 +03:00
6LoWPAN: add fragmentation support
2011-11-14 00:19:42 -05:00
ieee802154/nl-mac.c: make some MLME operations optional
2013-04-08 12:00:16 -04:00
ipv6: resend MLD report if a link-local address completes DAD
2013-06-28 21:19:17 -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
net: make snmp_mib_free static inline
2013-09-02 21:00:50 -07:00
ipv6: move csum_ipv6_magic() and udp6_csum_init() into static library
2013-01-08 17:56:10 -08:00
ipv6: prevent fib6_run_gc() contention
2013-08-01 14:16:20 -07:00
ipv6: move ip6_dst_hoplimit() into core kernel
2013-08-31 22:29:59 -04:00
ip6tnl: add x-netns support
2013-08-15 01:00:20 -07:00
ipv4: remove fib_update_nh_saddrs() declaration.
2013-07-02 00:33:52 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-08-16 15:37:26 -07:00
ipvs: add sync_persist_mode flag
2013-06-26 18:01:46 +09:00
ipv6: move ip6_dst_hoplimit() into core kernel
2013-08-31 22:29:59 -04:00
lapb: Neaten debugging
2012-05-17 18:45:20 -04:00
hostap: Don't use create_proc_read_entry()
2013-04-29 15:41:56 -04:00
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
2012-09-17 13:13:24 -04: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
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-08-29 14:08:24 -04: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
vxlan: add ipv6 proxy support
2013-08-31 22:30:01 -04:00
arp/neighbour.h: Remove extern from function prototypes
2013-07-31 17:50:02 -07:00
net: split rt_genid for ipv4 and ipv6
2013-07-31 14:56:36 -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
cls_cgroup.h netprio_cgroup.h: Remove extern from function prototypes
2013-07-31 17:50:02 -07: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
net: Remove extern from include/net/ scheduling prototypes
2013-07-31 17:24:22 -07:00
qdisc: allow setting default queuing discipline
2013-08-31 00:32:32 -04:00
net: Remove code duplication between offload structures
2012-11-15 17:39:51 -05: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
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
qdisc: make args to qdisc_create_default const
2013-08-31 18:09:45 -04: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
tcp: TSO packets automatic sizing
2013-08-29 15:50:06 -04:00
tcp: TSO packets automatic sizing
2013-08-29 15:50:06 -04: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
transp_v6.h: style neatening
2013-06-04 16:43:42 -07:00
pktgen: Add UDPCSUM flag to support UDP checksums
2013-07-27 22:16:36 -07:00
net: ipv4: Standardize prefixes for message logging
2012-03-12 17:05:21 -07:00
VSOCK: Move af_vsock.h and vsock_addr.h to include/net
2013-07-27 22:14:06 -07:00
vxlan: add ipv6 support
2013-08-31 22:30:00 -04: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: constify mark argument of xfrm_find_acq()
2013-08-05 11:13:53 +02:00
e7abfe4092