David S. Miller
c87acb2558
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ...
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2015-08-17
1) Fix IPv6 ECN decapsulation for IPsec interfamily tunnels.
From Thomas Egerer.
2) Use kmemdup instead of duplicating it in xfrm_dump_sa().
From Andrzej Hajda.
3) Pass oif to the xfrm lookups so that it gets set on the flow
and the resolver routines can match based on oif.
From David Ahern.
4) Add documentation for the new xfrm garbage collector threshold.
From Alexander Duyck.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-08-17 14:05:14 -07:00
9p: switch p9_client_read() to passing struct iov_iter *
2015-04-11 22:28:27 -04:00
Bluetooth: hci_check_conn_params() check proper range
2015-07-23 17:10:51 +02: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: fix netns dependencies with conntrack templates
2015-07-20 14:58:19 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-08-04 23:57:45 -07:00
NFC: nci: add generic uart support
2015-06-11 23:37:37 +02:00
sctp: fix ASCONF list handling
2015-06-14 12:55:49 -07:00
net_sched: act_mirred: remove spinlock in fast path
2015-07-08 13:50:42 -07:00
ieee802154: 6lowpan: rename process_data and lowpan_process_data
2014-10-27 15:51:16 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-07-31 23:52:20 -07:00
ipv6: change ipv6_stub_impl.ipv6_dst_lookup to take net argument
2015-07-31 15:21:30 -07: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 sock->sk_protinfo.
2015-06-28 16:55:44 -07: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: convert num_grat_arp to the new bonding option API
2015-07-27 01:05:24 -07:00
bonding: Implement user key part of port_key in an AD system.
2015-05-11 10:59:32 -04:00
cfg80211: use RTNL locked reg_can_beacon for IR-relaxation
2015-07-17 15:02:02 +02:00
cfg802154: add PM hooks
2015-07-23 17:10:49 +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
cls_cgroup: factor out classid retrieval
2015-07-20 12:41:30 -07: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/dcb: Add IEEE QCN attribute
2015-03-06 21:50:02 -05:00
netfilter: Pass socket pointer down through okfn().
2015-04-07 15:25:55 -04:00
net: dsa: add support for switchdev VLAN objects
2015-08-13 21:31:12 -07:00
dst: Metadata destinations
2015-07-21 10:39:05 -07:00
bpf: add helpers to access tunnel metadata
2015-07-31 15:20:22 -07:00
net: Remove protocol from struct dst_ops
2015-03-09 16:06:10 -04:00
fib: Add fib rule match on tunnel id
2015-07-21 10:39:06 -07:00
net: Use VRF device index for lookups on TX
2015-08-13 22:43:20 -07:00
mpls: Add MPLS entropy label in flow_keys
2015-06-04 15:44:31 -07: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: Remove support for sharing GRE protocol hook.
2015-08-10 14:03:54 -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
mac802154: cleanup llsec param flags
2015-06-12 11:42:29 +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
inet: frags: remove INET_FRAG_EVICTED and use list_evictor for the test
2015-07-26 21:00:15 -07:00
inet: simplify timewait refcounting
2015-07-09 15:12:20 -07:00
inet: add IP_BIND_ADDRESS_NO_PORT to overcome bind(0) limitations
2015-06-06 23:57:12 -07:00
inet: inet_twsk_deschedule factorization
2015-07-09 15:12:20 -07:00
tcp: simplify inetpeer_addr_base use
2015-03-31 13:58:35 -04:00
net: Set sk_txhash from a random number
2015-07-29 22:44:04 -07:00
net: add gro_compute_pseudo functions
2014-08-24 18:09:23 -07:00
ipv6: support for fib route lwtunnel encap attributes
2015-07-21 10:39:04 -07: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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-07-31 23:52:20 -07:00
ip_gre: Add support to collect tunnel metadata.
2015-08-10 14:03:54 -07:00
net: Introduce possible_net_t
2015-03-12 14:39:40 -04:00
ipv6: Enable auto flow labels by default
2015-07-31 17:07:12 -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 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
llc: Make llc_sap_action_t function pointer arrays const
2014-12-10 15:21:24 -05:00
lwtunnel: Make lwtun_encaps[] static
2015-07-29 22:59:39 -07:00
mac80211: convert HW flags to unsigned long bitmap
2015-06-10 16:05:36 +02:00
mac802154: do not export ieee802154_rx()
2015-07-23 17:10:50 +02: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
mpls: ip tunnel support
2015-07-21 10:39:05 -07:00
neigh: Factor out ___neigh_lookup_noref
2015-03-04 00:23:23 -05:00
net: add explicit logging and stat for neighbour table overflow
2015-08-10 13:46:21 -07:00
net: include missing headers in net/net_namespace.h
2015-06-18 21:14:29 +02: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
nl802154: fix misspelled enum
2015-06-10 12:24:33 +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
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
net: Fix up inet_addr_type checks
2015-08-13 22:43:21 -07:00
openvswitch: Use regular VXLAN net_device device
2015-07-21 10:39:07 -07:00
net: sched: extend percpu stats helpers
2015-07-08 13:50:41 -07: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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-07-31 23:52:20 -07:00
net: switchdev: support static FDB addresses
2015-08-11 12:03:19 -07:00
tcp: do not slow start when cwnd equals ssthresh
2015-07-09 14:22:52 -07:00
inet: add TCP_NEW_SYN_RECV state
2015-03-12 22:58:12 -04:00
inet: remove BUG_ON() in twsk_destructor()
2015-07-09 15:12:20 -07: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
net: Introduce VRF related flags and helpers
2015-08-13 22:43:20 -07:00
vxlan: combine VXLAN_FLOWBASED into VXLAN_COLLECT_METADATA
2015-08-07 11:46:34 -07:00
net: treewide: Fix typo found in DocBook/networking.xml
2014-09-05 17:35:28 -07:00
xfrm: Add oif to dst lookups
2015-08-11 12:41:35 +02:00
c87acb2558