David S. Miller
1f5a7407e4
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ...
Steffen Klassert says:
====================
1) Introduce skb_to_sgvec_nomark function to add further data to the sg list
without calling sg_unmark_end first. Needed to add extended sequence
number informations. From Fan Du.
2) Add IPsec extended sequence numbers support to the Authentication Header
protocol for ipv4 and ipv6. From Fan Du.
3) Make the IPsec flowcache namespace aware, from Fan Du.
4) Avoid creating temporary SA for every packet when no key manager is
registered. From Horia Geanta.
5) Support filtering of SA dumps to show only the SAs that match a
given filter. From Nicolas Dichtel.
6) Remove caching of xfrm_policy_sk_bundles. The cached socket policy bundles
are never used, instead we create a new cache entry whenever xfrm_lookup()
is called on a socket policy. Most protocols cache the used routes to the
socket, so this caching is not needed.
7) Fix a forgotten SADB_X_EXT_FILTER length check in pfkey, from Nicolas
Dichtel.
8) Cleanup error handling of xfrm_state_clone.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-24 18:13:33 -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: Add quirk for disabling Delete Stored Link Key command
2014-01-04 20:10: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
netfilter: nf_tables: fix racy rule deletion
2014-02-06 11:46:06 +01:00
xfrm: Remove caching of xfrm_policy_sk_bundles
2014-02-19 10:35:43 +01:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2014-01-17 14:43:17 -05:00
net: sctp: Fix a_rwnd/rwnd management to reflect real state of the receiver's buffer
2014-02-17 00:16:56 -05:00
net_sched: act: hide struct tcf_common from API
2014-02-12 19:23:32 -05:00
net_sched: act: refuse to remove bound action outside
2014-02-12 19:23:32 -05:00
ipv6: enable anycast addresses as source addresses for datagrams
2014-01-22 21:57:05 -08: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: 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: consider existing DFS interfaces
2014-02-04 21:58:17 +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
net: net_cls: move cgroupfs classid handling into core
2014-01-03 23:41:41 +01: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
include/net/: Fix FSF address in file headers
2013-12-06 12:37:56 -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
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: Add utility functions to clear rxhash
2013-12-17 16:36:21 -05: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
firewire net, ipv4 arp: Extend hardware address and remove driver-level packet inspection.
2013-03-26 12:32:13 -04:00
flowcache: Make flow cache name space aware
2014-02-12 07:02:11 +01:00
flow_dissector: factor out the ports extraction in skb_flow_get_ports
2013-10-03 15:36:37 -04: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_offload: statically build GRE offloading support
2014-01-06 20:28:34 -05: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/nl-mac.c: make some MLME operations optional
2013-04-08 12:00:16 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-18 00:55:41 -08: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
ipv6: tcp: fix flowlabel value in ACK messages send from TIME_WAIT
2014-01-17 17:56:33 -08:00
ipv4: remove unused function
2013-12-28 17:03:20 -05:00
ipv6: honor IPV6_PKTINFO with v4 mapped addresses on sendmsg
2014-02-19 16:28:42 -05:00
net: fix build errors if ipv6 is disabled
2013-10-09 13:04:03 -04:00
ipv6: remove prune parameter for fib6_clean_all
2014-01-02 03:30:35 -05:00
IPv6: add the option to use anycast addresses as source addresses in echo reply
2014-01-07 15:51:39 -05: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: fix a dst leak in tunnels
2014-01-17 18:36:39 -08:00
netfilter: push reasm skb through instead of original frag skbs
2013-11-11 00:19:35 -05:00
ipv6: protect protocols not handling ipv4 from v4 connection/bind attempts
2014-01-21 16:59:19 -08: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: propagate STBC / LDPC flags to radiotap
2014-02-06 09:34:58 +01:00
ieee802154: add netlink APIs for smartMAC configuration
2014-02-17 16:42:39 -05: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: use NEIGH_VAR_INIT in ndo_neigh_setup functions.
2014-01-16 11:31:58 -08:00
net: Move prototype declaration to header file include/net/net_namespace.h from net/ipx/af_ipx.c
2014-02-09 17:32:50 -08: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
netevent/netlink.h: Remove extern from function prototypes
2013-09-21 14:01:39 -04:00
net: netprio: rename config to be more consistent with cgroup configs
2014-01-03 23:41:42 +01: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
ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams
2014-01-19 19:53:18 -08:00
net_sched: optimize tcf_match_indev()
2014-01-13 11:50:15 -08:00
pkt_sched: give visibility to mq slave qdiscs
2013-12-09 19:54:47 -05:00
net: Add GRO support for UDP encapsulating protocols
2014-01-21 18:05:04 -08: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: make regulatory_hint() remove REGULATORY_CUSTOM_REG
2014-01-13 14:46:58 -05: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 ip_dst_mtu_maybe_forward and protect forwarding path against pmtu spoofing
2014-01-13 11:22:54 -08:00
rtnl: make ifla_policy static
2014-02-18 18:15:42 -05:00
net_sched: add struct net pointer to tcf_proto_ops->dump
2014-01-13 11:50:14 -08: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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2014-01-05 20:18:50 -05: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 unused min_cwnd member of tcp_congestion_ops
2014-02-13 18:22:34 -05: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
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
net: Add GRO support for vxlan traffic
2014-01-21 18:05:04 -08: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
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
ipsec: add support of limited SA dump
2014-02-17 07:18:19 +01:00
1f5a7407e4