David S. Miller
1edaa7e8a7
For this round we mostly have fixes: ...
* mesh fixes from Alexis Green and Chun-Yeow Yeoh,
* a documentation fix from Jakub Kicinski,
* a missing channel release (from Michal Kazior),
* a fix for a signal strength reporting bug (from Sara Sharon),
* handle deauth while associating (myself),
* don't report mangled TX SKB back to userspace for status (myself),
* handle aggregation session timeouts properly in fast-xmit (myself)
However, there are also a few cleanups and one big change that
affects all drivers (and that required me to pull in your tree)
to change the mac80211 HW flags to use an unsigned long bitmap
so that we can extend them more easily - we're running out of
flags even with a cleanup to remove the two unused ones.
-----BEGIN PGP SIGNATURE-----
iQIcBAABCAAGBQJVeEQ1AAoJEDBSmw7B7bqrebcP/3v7I2ZXAeHag2W4hdD4YH6W
tuKfs3JKW3GDh84l2AJs2JBpFxR6Tk0Z7zGKrPLzkBTkkJkSLgKuUKR0+YQU6PYH
VfZ2NkdIHEqouLgMWxGGlp6suqp2yYD9tiIUroICXZ6aFm5trQuZgzv5ePI+lhmX
cWUYCawE2tcpVdg0NJsFExeCJhw81e/Bet1LCGHo0asWNpIK7phMdltzD7e4tgQS
4q475FCIkWxbxKgJRrRkz8J7grsjK1wf2W3acOxKMaoVBeqJVW5BWDrTgo0aDPts
qQ8n8t1s9o/jKQIvaz3RyjkQgX8T4vCMqkouLF4jJOThKIsUSi3Fvm9oKcMg4YhA
Ju5QWfbCBFhpLZeBzWzKyePTnDru1XDFFVdIATLONKTVg1modzFAs3j5gb4Z3Wtg
VYLoLWWpRtHKd9pzfZMhyWq64Xb8C+qlyQHr4r4QRm9ADz0Jq+OCh0rTFt+/bncM
CHxnf0VS9hEOFk0+TxFqi2yXOnv2uMgcN+jnGkEs4QuLfv9ML1Eb23ZjDoHxd1uq
1Yd4R8IDEY/KU6UJMwksz+gV/ekoB32eAhw56pxehgAMuZL4OgNvmeAQHx7Jq9it
0/OfAK2BSNH8odqYQbpg89C8keqSInMwUhFyRhyMJAWSKiPRHypsDBWxMKGJIssI
3mB4d/go+RP1AvZnazeF
=2wTw
-----END PGP SIGNATURE-----
Merge tag 'mac80211-next-for-davem-2015-06-10' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
For this round we mostly have fixes:
* mesh fixes from Alexis Green and Chun-Yeow Yeoh,
* a documentation fix from Jakub Kicinski,
* a missing channel release (from Michal Kazior),
* a fix for a signal strength reporting bug (from Sara Sharon),
* handle deauth while associating (myself),
* don't report mangled TX SKB back to userspace for status (myself),
* handle aggregation session timeouts properly in fast-xmit (myself)
However, there are also a few cleanups and one big change that
affects all drivers (and that required me to pull in your tree)
to change the mac80211 HW flags to use an unsigned long bitmap
so that we can extend them more easily - we're running out of
flags even with a cleanup to remove the two unused ones.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-10 22:49:49 -07:00
9p: switch p9_client_read() to passing struct iov_iter *
2015-04-11 22:28:27 -04:00
Bluetooth: Read LE remote features during connection establishment
2015-04-09 08:36:54 +03:00
caif: fix a signedness bug in cfpkt_iterate()
2015-02-20 17:35:14 -05:00
irda: Convert function pointer arrays and uses to const
2014-12-10 15:33:16 -05:00
netfilter: nf_tables: allow to bind table to net_device
2015-05-26 18:41:17 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-05-31 00:02:30 -07:00
nfc: nci: Add comment to explain NCI_HCI_MAX_PIPES
2015-04-06 00:19:05 +02:00
sctp: Fix mangled IPv4 addresses on a IPv6 listening socket
2015-05-27 14:15:26 -04:00
act_bpf: add initial eBPF support for actions
2015-03-20 19:10:44 -04:00
ieee802154: 6lowpan: rename process_data and lowpan_process_data
2014-10-27 15:51:16 +01:00
net_sched: act: refuse to remove bound action outside
2014-02-12 19:23:32 -05:00
net: Export IGMP/MLD message validation code
2015-05-04 14:49:23 -04:00
ieee802154: mac802154: remove FSF address
2014-10-25 08:07:30 +02:00
net/unix: support SCM_SECURITY for stream sockets
2015-06-10 22:49:20 -07:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
ipsec: Remove obsolete MAX_AH_AUTH_LEN
2014-09-18 10:54:36 +02:00
neigh: Factor out ___neigh_lookup_noref
2015-03-04 00:23:23 -05:00
ax25: Stop using magic neighbour cache operations.
2015-03-03 14:44:41 -05:00
bonding: Implement port churn-machine (AD standard 43.4.17).
2015-02-24 16:05:48 -05:00
net: Move bonding headers under include/net
2014-11-10 13:27:49 -05:00
bonding: Implement user key part of port_key in an AD system.
2015-05-11 10:59:32 -04:00
bonding: Implement user key part of port_key in an AD system.
2015-05-11 10:59:32 -04:00
sched, net: Fixup busy_loop_us_clock()
2014-01-13 17:39:11 +01:00
cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnect
2015-05-26 15:21:27 +02:00
nl802154: add support to set cca ed level
2015-05-27 19:29:42 +02:00
net: fix sparse error in csum_replace4()
2015-05-17 13:08:29 -04:00
cipso: don't use IPCB() to locate the CIPSO IP option
2015-02-11 14:46:37 -05:00
cgroup: clean up cgroup_subsys names and initialization
2014-02-08 10:36:58 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-05-13 14:31:43 -04:00
net: switch importing msghdr from userland to {compat_,}import_iovec()
2015-04-09 00:02:26 -04:00
net: Move prototype declaration to header file include/net/datalink.h from net/ipx/af_ipx.c
2014-02-09 17:32:50 -08:00
include/net/: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
net/dcb: Add IEEE QCN attribute
2015-03-06 21:50:02 -05:00
net: Move prototype declaration to header file include/net/dn.h from net/decnet/af_decnet.c
2014-02-09 17:32:49 -08:00
dn_dev: add support for IFA_FLAGS nl attribute
2013-12-10 21:50:00 -05:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
net: Move prototype declaration to appropriate header file from decnet/af_decnet.c
2014-02-09 17:32:49 -08:00
net: dsa: Add basic framework to support ndo_fdb functions
2015-03-29 13:23:54 -07:00
net: make skb_dst_pop routine static
2015-05-12 23:19:49 -04:00
net: Remove protocol from struct dst_ops
2015-03-09 16:06:10 -04:00
net: move pskb_put() to core code
2013-11-07 19:28:58 -05:00
net: ethoc: set up MII management bus clock
2014-02-04 20:19:51 -08:00
net: Kill hold_net release_net
2015-03-12 14:39:40 -04:00
ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
2014-04-16 15:05:11 -04:00
mpls: Add MPLS entropy label in flow_keys
2015-06-04 15:44:31 -07:00
flowcache: Make flow cache name space aware
2014-02-12 07:02:11 +01:00
ip_tunnel: Ops registration for secondary encap (fou, gue)
2014-11-12 15:01:35 -05:00
net: sched: enable per cpu qstats
2014-09-30 01:02:26 -04:00
net: Introduce possible_net_t
2015-03-12 14:39:40 -04:00
geneve: move definition of geneve_hdr() to geneve.h
2015-05-13 15:59:13 -04:00
gre: Call gso_make_checksum
2014-06-04 22:46:38 -07:00
ip_tunnel: Create percpu gro_cell
2015-01-18 01:56:32 -05:00
gue: Protocol constants for remote checksum offload
2014-11-05 16:30:03 -05:00
mac80211: propagate STBC / LDPC flags to radiotap
2014-02-06 09:34:58 +01:00
ieee802154: Remove ieee802154_reduced_mlme_ops references.
2015-05-26 20:26:09 +02:00
ipv6: do retries on stable privacy addresses
2015-03-23 22:12:09 -04:00
inet: get rid of central tcp/dccp listener timer
2015-03-20 12:40:25 -04:00
ipv6: get rid of __inet6_hash()
2015-03-18 22:00:35 -04:00
net: Modify sk_alloc to not reference count the netns of kernel sockets.
2015-05-11 10:50:18 -04:00
tcp: fix child sockets to use system default congestion control if not set
2015-05-31 21:49:14 -07:00
tunnel: fix RFC number in comment for INET_ECN_decapsulate()
2014-05-07 15:30:52 -04:00
ip_fragment: don't forward defragmented DF packet
2015-05-27 13:03:31 -04:00
tcp: fix/cleanup inet_ehash_locks_alloc()
2015-05-26 19:48:46 -04:00
inet: add IP_BIND_ADDRESS_NO_PORT to overcome bind(0) limitations
2015-06-06 23:57:12 -07:00
tcp/dccp: get rid of central timewait timer
2015-04-13 16:40:05 -04:00
tcp: simplify inetpeer_addr_base use
2015-03-31 13:58:35 -04:00
net: Add full IPv6 addresses to flow_keys
2015-06-04 15:44:30 -07:00
net: add gro_compute_pseudo functions
2014-08-24 18:09:23 -07:00
ipv6: Create percpu rt6_info
2015-05-25 13:25:35 -04:00
ipv6: Add rt6_get_cookie() function
2015-05-25 13:25:34 -04:00
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
ipv4: FIB Local/MAIN table collapse
2015-03-11 16:22:14 -04:00
ipip,gre,vti,sit: implement ndo_get_iflink
2015-04-02 14:05:00 -04:00
net: Introduce possible_net_t
2015-03-12 14:39:40 -04:00
net: Add full IPv6 addresses to flow_keys
2015-06-04 15:44:30 -07:00
switch ipxrtr_route_packet() from iovec to msghdr
2014-11-24 04:28:49 -05:00
wext: add checked wrappers for adding events/points to streams
2015-02-28 21:31:12 +01:00
lib80211: remove unused print_ssid()
2014-10-14 02:18:27 +02:00
llc: make lock static
2014-01-03 20:56:48 -05:00
llc: Make llc_conn_ev_qfyr_t function pointer arrays const
2014-12-10 15:21:24 -05:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
net: llc: fix order of evaluation in llc_conn_ac_inc_vr_by_1
2014-01-01 22:22:43 -05:00
llc: Make llc_sap_action_t function pointer arrays const
2014-12-10 15:21:24 -05:00
mac80211: convert HW flags to unsigned long bitmap
2015-06-10 16:05:36 +02:00
cfg802154: introduce wpan phy flags
2015-05-19 11:44:42 +02:00
include/net/: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
ipv6: mld: answer mldv2 queries with mldv1 reports in mldv1 fallback
2014-09-22 16:23:15 -04:00
openvswitch: Add basic MPLS support to kernel
2014-11-05 23:52:33 -08:00
neigh: Factor out ___neigh_lookup_noref
2015-03-04 00:23:23 -05:00
net: neighbour: Add mcast_resolicit to configure the number of multicast resolicitations in PROBE state.
2015-03-20 21:47:40 -04:00
netns: make nsid_lock per net
2015-05-17 23:41:11 -04:00
netlabel: fix the netlbl_catmap_setlong() dummy function
2014-08-07 20:55:21 -04:00
netlink: implement nla_get_in_addr and nla_get_in6_addr
2015-03-31 13:58:35 -04:00
cgroup: clean up cgroup_subsys names and initialization
2014-02-08 10:36:58 -05:00
nl802154: add support for dump phy capabilities
2015-05-19 11:44:44 +02:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
net: sched: remove tcf_proto from ematch calls
2014-10-06 18:02:32 -04:00
net: rename vlan_tx_* helpers since "tx" is misleading there
2015-01-13 17:51:08 -05:00
net: Eliminate no_check from protosw
2014-05-23 16:28:53 -04:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
cfg80211: allow wiphy specific regdomain management
2014-12-17 11:49:55 +01:00
tcp: provide SYN headers for passive connections
2015-05-05 16:02:34 -04:00
ipv4: per cpu uncached list
2015-01-15 18:26:16 -05:00
rtnetlink: Mark name argument of rtnl_create_link() const
2015-04-10 12:42:40 -07:00
net: sched: use counter to break reclassify loops
2015-05-13 15:08:14 -04:00
inetpeer: get rid of ip_id_count
2014-06-02 11:00:41 -07:00
Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-15 07:48:18 +02:00
tcp: add a force_schedule argument to sk_stream_alloc_skb()
2015-05-21 16:56:40 -04:00
drivers: net: Include new header file in sbni.c
2013-12-19 18:51:20 -05:00
switchdev: add support for fdb add/del/dump via switchdev_port_obj ops.
2015-05-17 22:49:09 -04:00
tcp: get_cookie_sock() consolidation
2015-06-07 15:19:52 -07:00
inet: add TCP_NEW_SYN_RECV state
2015-03-12 22:58:12 -04:00
ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams
2014-01-19 19:53:18 -08:00
net: Add a software TSO helper API
2014-05-22 14:57:15 -04:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
net: switch memcpy_fromiovec()/memcpy_fromiovecend() users to copy_from_iter()
2015-02-04 01:34:15 -05:00
udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().
2015-04-07 15:29:08 -04:00
net: treewide: Fix typo found in DocBook/networking.xml
2014-09-05 17:35:28 -07:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
1edaa7e8a7