David S. Miller
3fd0202a0d
Merge tag 'master-2014-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next ...
John W. Linville says:
====================
pull request: wireless-next 2014-07-25
Please pull this batch of updates intended for the 3.17 stream!
For the mac80211 bits, Johannes says:
"We have a lot of TDLS patches, among them a fix that should make hwsim
tests happy again. The rest, this time, is mostly small fixes."
For the Bluetooth bits, Gustavo says:
"Some more patches for 3.17. The most important change here is the move of
the 6lowpan code to net/6lowpan. It has been agreed with Davem that this
change will go through the bluetooth tree. The rest are mostly clean up and
fixes."
and,
"Here follows some more patches for 3.17. These are mostly fixes to what
we've sent to you before for next merge window."
For the iwlwifi bits, Emmanuel says:
"I have the usual amount of BT Coex stuff. Arik continues to work
on TDLS and Ariej contributes a few things for HS2.0. I added a few
more things to the firmware debugging infrastructure. Eran fixes a
small bug - pretty normal content."
And for the Atheros bits, Kalle says:
"For ath6kl me and Jessica added support for ar6004 hw3.0, our latest
version of ar6004.
For ath10k Janusz added a printout so that it's easier to check what
ath10k kconfig options are enabled. He also added a debugfs file to
configure maximum amsdu and ampdu values. Also we had few fixes as
usual."
On top of that is the usual large batch of various driver updates --
brcmfmac, mwifiex, the TI drivers, and wil6210 all get some action.
Rafał has also been very busy with b43 and related updates.
Also, I pulled the wireless tree into this in order to resolve a
merge conflict...
P.S. The change to fs/compat_ioctl.c reflects a name change in a
Bluetooth header file...
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-07-28 17:36:25 -07:00
9pnet: p9_client->conn field is unused. Remove it.
2014-03-25 16:38:16 -05:00
Bluetooth: Introduce a flag to track who really initiates authentication
2014-07-17 14:39:40 +02:00
caif_hsi.h: Remove extern from function prototypes
2013-09-23 16:29:41 -04:00
include/net/: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
af_iucv: fix recvmsg by replacing skb_pull() function
2013-04-08 17:16:57 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-07-22 00:44:59 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-07-22 00:44:59 -07:00
NFC: Add RAW socket type support for SOCKPROTO_RAW
2014-05-20 00:06:04 +02:00
net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY
2014-07-22 13:32:11 -07:00
net_sched: act: hide struct tcf_common from API
2014-02-12 19:23:32 -05:00
6lowpan: include net/net_namespace.h on 6lowpan namepsace header
2014-04-20 18:18:55 -04:00
net_sched: act: refuse to remove bound action outside
2014-02-12 19:23:32 -05:00
net: ipv6: Introduce ip6_sk_dst_hoplimit.
2014-04-30 13:31:26 -04:00
ieee802154: add dgram sockopts for security control
2014-05-16 17:23:41 -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: Make transport the proto owner
2014-05-05 13:13:50 -04:00
arp: make arp_invalidate static
2013-12-28 17:02:46 -05:00
ax25.h: Remove extern from function prototypes
2013-07-31 17:50:02 -07:00
sched, net: Fixup busy_loop_us_clock()
2014-01-13 17:39:11 +01:00
cfg80211: remove channel_switch combination check
2014-06-25 18:06:20 +02:00
net: Allow csum_add to be provided in arch
2014-05-05 15:26:29 -04:00
cipso: cleanup cipso_v4_translate() when !CONFIG_NETLABEL
2013-12-10 17:56:54 -05:00
cgroup: clean up cgroup_subsys names and initialization
2014-02-08 10:36:58 -05:00
net: introduce reciprocal_scale helper and convert users
2014-01-21 23:17:20 -08:00
compat.h: Remove extern from function prototypes
2013-09-20 14:49:32 -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
Update setapp/getapp prototypes in dcbnl_rtnl_ops to return int instead of u8
2014-07-17 16:02:29 -07: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
decnet (dn*.h): Remove extern from function prototypes
2013-09-20 14:49:32 -04:00
decnet (dn*.h): Remove extern from function prototypes
2013-09-20 14:49:32 -04:00
decnet (dn*.h): Remove extern from function prototypes
2013-09-20 14:49:32 -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 ds_to_priv
2014-04-30 13:31:25 -04:00
ipv4: add a sock pointer to dst->output() path.
2014-04-15 13:47:15 -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
fib_rules.h: Remove extern from function prototypes
2013-09-20 14:49:33 -04:00
ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
2014-04-16 15:05:11 -04:00
flow_dissector: Abstract out hash computation
2014-07-07 21:14:20 -07:00
flowcache: Make flow cache name space aware
2014-02-12 07:02:11 +01:00
garp.h: Remove extern from function prototypes
2013-09-20 14:49:33 -04:00
gen_stats.h: Remove extern from function prototypes
2013-09-20 14:49:33 -04:00
genl: Add genlmsg_new_unicast() for unicast message allocation
2014-01-06 15:51:53 -08:00
gre: Call gso_make_checksum
2014-06-04 22:46:38 -07:00
icmp.h: Remove extern from function prototypes
2013-09-20 14:49:33 -04:00
mac80211: propagate STBC / LDPC flags to radiotap
2014-02-06 09:34:58 +01:00
ieee802154: add definitions for link-layer security and header functions
2014-05-15 15:51:42 -04:00
ieee802154, mac802154: implement devkey record option
2014-05-16 17:23:42 -04:00
ipv6: addrconf: implement address generation modes
2014-07-11 15:05:45 -07:00
ipv4: add a sock pointer to ip_queue_xmit()
2014-04-15 12:58:34 -04:00
ipv6: split inet6_ehashfn to hash functions per compilation unit
2013-10-19 19:45:34 -04:00
inet*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
ipv4: add a sock pointer to ip_queue_xmit()
2014-04-15 12:58:34 -04:00
tunnel: fix RFC number in comment for INET_ECN_decapsulate()
2014-05-07 15:30:52 -04:00
inet: frag: use seqlock for hash rebuild
2014-07-27 22:34:36 -07:00
net: Use a more standard macro for INET_ADDR_COOKIE
2014-05-14 16:07:23 -04:00
net: remove inet6_reqsk_alloc
2014-06-27 15:53:35 -07:00
inet: move ipv6only in sock_common
2014-07-01 23:46:21 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-06-03 23:32:12 -07:00
inet: frag: don't account number of fragment queues
2014-07-27 22:34:36 -07:00
udp: Generic functions to set checksum
2014-06-04 22:46:38 -07:00
ipv6: do not overwrite inetpeer metrics prematurely
2014-03-27 15:09:07 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-24 00:32:30 -04:00
net: unify the pcpu_tstats and br_cpu_netstats as one
2014-01-04 20:10:24 -05:00
ip*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
ipv4: add a sock pointer to dst->output() path.
2014-04-15 13:47:15 -04:00
arch: Mass conversion of smp_mb__*()
2014-04-18 14:20:48 +02:00
inet: frag: don't account number of fragment queues
2014-07-27 22:34:36 -07:00
net: Move prototype declaration to header file include/net/ipx.h from net/ipx/af_ipx.c
2014-02-09 17:32:50 -08:00
iw_handler.h: Remove extern from function prototypes
2013-09-21 14:01:39 -04:00
lapb.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
hostap: Don't use create_proc_read_entry()
2013-04-29 15:41:56 -04:00
llc: make lock static
2014-01-03 20:56:48 -05:00
llc*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
llc*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
llc*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
llc*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -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*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
llc*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
llc*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
mac80211: add support for Rx reordering offloading
2014-07-21 17:42:07 +02:00
mac802154: at86rf230: add hw flags and merge ops
2014-07-07 21:29:24 -07:00
include/net/: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
net: ipv6: mld: get rid of MLDV2_MRC and simplify calculation
2013-09-04 14:53:20 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-01 17:06:14 -04:00
ndisc.h: Remove extern from function prototypes
2013-09-21 14:01:39 -04:00
neigh: sysctl - simplify address calculation of gc_* variables
2014-07-14 14:32:51 -07:00
6lowpan: nuke net_ieee802154_lowpan() accessor when 6lowpan is disabled
2014-04-24 12:36:00 -04:00
netevent/netlink.h: Remove extern from function prototypes
2013-09-21 14:01:39 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
netlink: Fix shadow warning on jiffies
2014-07-28 17:20:43 -07:00
cgroup: clean up cgroup_subsys names and initialization
2014-02-08 10:36:58 -05:00
netrom.h: Remove extern from function prototypes
2013-09-21 14:01:39 -04:00
ieee802154: use ieee802154_addr instead of *_sa variants
2014-03-14 22:15:26 -04:00
p8022.h: Remove extern from function prototypes
2013-09-21 14:01:39 -04:00
ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams
2014-01-19 19:53:18 -08:00
sched, cls: check if we could overwrite actions when changing a filter
2014-04-27 23:42:39 -04:00
net_sched: drr: warn when qdisc is not work conserving
2014-06-11 15:50:59 -07:00
net: Eliminate no_check from protosw
2014-05-23 16:28:53 -04:00
psnap.h: Remove extern from function prototypes
2013-09-23 01:51:08 -04:00
raw/rawv6.h: Remove extern from function prototypes
2013-09-23 01:51:08 -04:00
raw/rawv6.h: Remove extern from function prototypes
2013-09-23 01:51:08 -04:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
cfg80211: Enable GO operation on additional channels
2014-04-09 10:55:34 +02:00
inet: includes a sock_common in request_sock
2013-10-10 00:08:07 -04:00
rose.h: Remove extern from function prototypes
2013-09-23 01:51:08 -04:00
ipv4: remove ip_rt_dump from route.c
2014-03-24 12:45:01 -04:00
net: rtnetlink - make create_link take name_assign_type
2014-07-15 16:13:07 -07:00
flow_keys: Record IP layer protocol in skb_flow_dissect()
2014-06-23 14:32:19 -07:00
scm.h: Remove extern from function prototypes
2013-09-23 01:51:09 -04:00
inetpeer: get rid of ip_id_count
2014-06-02 11:00:41 -07:00
net: clean up snmp stats code
2014-05-07 16:06:05 -04:00
sock: remove skb argument from sk_rcvqueues_full
2014-07-23 13:23:06 -07:00
drivers: net: Include new header file in sbni.c
2013-12-19 18:51:20 -05:00
stp.h: Remove extern from function prototypes
2013-09-23 01:51:09 -04:00
tcp: Remove unnecessary arg from tcp_enter_cwr and tcp_init_cwnd_reduction
2014-07-15 16:19:36 -07:00
tcp_memcontrol: Kill struct tcp_memcontrol
2013-10-21 18:43:02 -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
udp: Add function to make source port for UDP tunnels
2014-07-07 21:14:21 -07:00
udp: Add udp_sock_create for UDP tunnels to open listener socket
2014-07-14 16:12:15 -07:00
udplite.h: Remove extern from function prototypes
2013-09-23 16:29:40 -04:00
VSOCK: Move af_vsock.h and vsock_addr.h to include/net
2013-07-27 22:14:06 -07:00
vxlan: Call udp_flow_src_port
2014-07-07 21:14:21 -07:00
wext.h: Remove extern from function prototypes
2013-09-23 16:29:40 -04:00
wimax: Spelling s/than/that/, wording s/destinatary/recipient/
2014-05-05 15:37:55 +02:00
ieee802154: add netlink APIs for smartMAC configuration
2014-02-17 16:42:39 -05:00
x25.h: Remove extern from function prototypes
2013-09-23 16:29:41 -04:00
xfrm: Remove useless xfrm_audit struct.
2014-04-23 08:21:04 +02:00
3fd0202a0d