David S. Miller
6ea09d8a09
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next ...
John W. Linville says:
====================
Please pull this batch of updates for the 3.14 stream...
For the Bluetooth bits, Gustavo says:
"This is the first batch of patches intended for 3.14. There is
nothing big here. Most of the code are refactors, clean up, small
fixes, plus some new device id support."
And...
"More patches to 3.14. Here we have the support for Low Energy
Connection Oriented Channels (LE CoC). Basically, as the name says,
this adds supports for connection oriented channels in the same way
we already have them for BR/EDR connections so profiles/protocols
that work on top of BR/EDR can now work on LE plus a plenty of new
possibilities for LE."
For the ath10k bits, Kalle says:
"Janusz and Marek implemented DFS support to ath10k, but the code is
not enabled yet due to missing cfg80211/mac80211 patches (it will be
enabled in the next pull request). Michal did some device reset fixes
and made it possible for ath10k to share an interrupt with another
device. And lots of smaller fixes from different people."
For the iwlwifi bits, Emmanuel says:
"I have here a big rework of the rate control by Eyal. This is obviously
the biggest part of this batch.
I also have enhancement of protection flags by Avri and a few bits for
WoWLAN by Eliad and Luca. Johannes cleans up the debugfs plus a few
fixes. I provided a few things for Bluetooth coexistence.
Besides this we have an implementation for low priority scan."
Along with all that, there are big batches of updates to mwifiex and
ath9k, Jeff Kirsher's FSF address fix patches, and a handful of other
bits here and there.
Please let me know if there are problems!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-17 15:08:17 -05:00
for-linus-3.12-merge minor 9p fixes and tweaks for 3.12 merge window
2013-09-11 12:34:13 -07:00
Bluetooth: Use macros for connectionless slave broadcast features
2013-12-09 00:02:41 +04: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
netfilter: push reasm skb through instead of original frag skbs
2013-11-11 00:19:35 -05:00
tcp_memcontrol: Remove the per netns control.
2013-10-21 18:43:02 -04:00
include/net/: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
sctp: Reorder 'struc association' members to reduce its size
2013-12-17 14:32:43 -05:00
include/net/: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
net: Remove extern from include/net/ scheduling prototypes
2013-07-31 17:24:22 -07:00
neigh: ipv6: respect default values set before an address is assigned to device
2013-12-09 20:56:12 -05: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
ax25.h: Remove extern from function prototypes
2013-07-31 17:50:02 -07:00
net: add cpu_relax to busy poll loop
2013-08-28 17:45:48 -04:00
cfg80211/mac80211/ath6kl: acquire wdev lock outside ch_switch_notify
2013-12-02 11:51:54 +01:00
net: checksum: fix warning in skb_checksum
2013-11-04 15:27:08 -05:00
cipso: cleanup cipso_v4_translate() when !CONFIG_NETLABEL
2013-12-10 17:56:54 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
net: codel: Avoid undefined behavior from signed overflow
2013-11-04 20:01:29 -05:00
compat.h: Remove extern from function prototypes
2013-09-20 14:49:32 -04:00
include/net/: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
include/net/: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
decnet (dn*.h): Remove extern from function prototypes
2013-09-20 14:49:32 -04: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
decnet (dn*.h): Remove extern from function prototypes
2013-09-20 14:49:32 -04:00
ipv6: Optimize ipv6_change_dsfield().
2013-01-09 23:59:53 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
net: move pskb_put() to core code
2013-11-07 19:28:58 -05:00
fib_rules.h: Remove extern from function prototypes
2013-09-20 14:49:33 -04:00
firewire net, ipv4 arp: Extend hardware address and remove driver-level packet inspection.
2013-03-26 12:32:13 -04:00
flow.h/flow_keys.h: Remove extern from function prototypes
2013-09-20 14:49:33 -04:00
flow_dissector: factor out the ports extraction in skb_flow_get_ports
2013-10-03 15:36:37 -04: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
genetlink: fix genl_set_err() group ID
2013-11-21 13:09:43 -05:00
ipv4: generalize gre_handle_offloads
2013-10-19 19:36:18 -04:00
gro: Fix kcalloc argument order
2013-01-27 22:46:33 -05:00
icmp.h: Remove extern from function prototypes
2013-09-20 14:49:33 -04:00
mac80211: add radiotap flag and handling for 5/10 MHz
2013-07-16 09:58:05 +03:00
ieee802154/nl-mac.c: make some MLME operations optional
2013-04-08 12:00:16 -04:00
ipv6 addrconf: extend ifa_flags to u32
2013-12-06 16:34:43 -05:00
inet*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -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
inet*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
net: Correct comparisons and calculations using skb->tail and skb-transport_header
2013-05-28 23:49:07 -07:00
inet: remove old fragmentation hash initializing
2013-10-23 17:01:41 -04:00
tcp/dccp: remove twchain
2013-10-08 23:19:24 -04:00
inet: convert inet_ehash_secret and ipv6_hash_secret to net_get_random_once
2013-10-19 19:45:35 -04:00
netdev: inet_timewait_sock.h missing semi-colon when KMEMCHECK is enabled
2013-10-17 15:56:53 -04:00
inet*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
inet: fix addr_len/msg->msg_namelen assignment in recv_error and rxpmtu functions
2013-11-23 14:46:23 -08:00
net: fix build errors if ipv6 is disabled
2013-10-09 13:04:03 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-11-04 13:48:30 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
tunnels: harmonize cleanup done on skb on xmit path
2013-09-04 00:27:25 -04:00
ip*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
ipv4: generalize gre_handle_offloads
2013-10-19 19:36:18 -04:00
netfilter: push reasm skb through instead of original frag skbs
2013-11-11 00:19:35 -05:00
ipv6: add ip6_flowlabel helper
2013-12-09 21:03:49 -05:00
ipx.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04: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*.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
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
llc*.h: Remove extern from function prototypes
2013-09-21 14:01:38 -04:00
mac80211: add min required channel definition field
2013-11-25 20:52:05 +01:00
mac802154: correct a typo in ieee802154_alloc_device() prototype
2013-10-21 18:56:23 -04: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
ipv6: router reachability probing
2013-12-11 16:02:58 -05:00
netfilter: nf_tables: complete net namespace support
2013-10-14 18:00:59 +02:00
netevent/netlink.h: Remove extern from function prototypes
2013-09-21 14:01:39 -04:00
include/net/: Fix FSF address in file headers
2013-12-06 12:37:56 -05: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
2013-09-05 14:54:29 -07:00
netrom.h: Remove extern from function prototypes
2013-09-21 14:01:39 -04:00
p8022.h: Remove extern from function prototypes
2013-09-21 14:01:39 -04:00
inet: fix addr_len/msg->msg_namelen assignment in recv_error and rxpmtu functions
2013-11-23 14:46:23 -08:00
net: Remove extern from include/net/ scheduling prototypes
2013-07-31 17:24:22 -07:00
pkt_sched: give visibility to mq slave qdiscs
2013-12-09 19:54:47 -05:00
protocol.h: Remove extern from function prototypes
2013-09-23 01:51:08 -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
cfg80211: use enum nl80211_dfs_regions for dfs_region everywhere
2013-11-25 20:52:12 +01: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: introduce new IP_MTU_DISCOVER mode IP_PMTUDISC_INTERFACE
2013-11-05 21:52:27 -05:00
rtnetlink.h: Remove extern from function prototypes
2013-09-23 01:51:09 -04:00
net_sched: add u64 rate to psched_ratecfg_precompute()
2013-09-20 14:41:02 -04:00
scm.h: Remove extern from function prototypes
2013-09-23 01:51:09 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-01 17:06:14 -04:00
tcp_memcontrol: Cleanup/fix cg_proto->memory_pressure handling.
2013-12-05 21:01:01 -05:00
stp.h: Remove extern from function prototypes
2013-09-23 01:51:09 -04:00
tcp: auto corking
2013-12-06 12:51:41 -05:00
tcp_memcontrol: Kill struct tcp_memcontrol
2013-10-21 18:43:02 -04:00
transp_v6.h: style neatening
2013-06-04 16:43:42 -07:00
udp: Remove unnecessary semicolon from do{}while (0) macro
2013-11-07 02:14:33 -05: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: Have the NIC drivers do less work for offloads
2013-10-29 02:39:13 -07:00
wext.h: Remove extern from function prototypes
2013-09-23 16:29:40 -04:00
wimax.h: Remove extern from function prototypes
2013-09-23 16:29:41 -04:00
x25.h: Remove extern from function prototypes
2013-09-23 16:29:41 -04:00
ipv6: Add a receive path hook for vti6 in xfrm6_mode_tunnel.
2013-10-09 13:16:36 +02:00
6ea09d8a09