David S. Miller
ca00942a81
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec ...
Steffen Klassert says:
====================
pull request (net): ipsec 2015-03-16
1) Fix the network header offset in _decode_session6
when multiple IPv6 extension headers are present.
From Hajime Tazaki.
2) Fix an interfamily tunnel crash. We set outer mode
protocol too early and may dispatch to the wrong
address family. Move the setting of the outer mode
protocol behind the last accessing of the inner mode
to fix the crash.
3) Most callers of xfrm_lookup() expect that dst_orig
is released on error. But xfrm_lookup_route() may
need dst_orig to handle certain error cases. So
introduce a flag that tells what should be done in
case of error. From Huaibin Wang.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-16 16:16:49 -04:00
net/9p: remove a comment about pref member which doesn't exist
2014-11-06 14:59:19 -05:00
Bluetooth: Remove mgmt_rp_read_local_oob_ext_data struct
2015-02-02 18:27:56 +01: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: fix userdata length overflow
2015-03-04 18:46:06 +01:00
ipv4: Namespecify TCP PMTU mechanism
2015-02-09 18:45:00 -08:00
NFC: nci: Move logical connection structure allocation
2015-02-04 09:14:09 +01:00
switch sctp_user_addto_chunk() and sctp_datamsg_from_user() to passing iov_iter
2014-11-24 05:16:40 -05:00
net: sched: Introduce connmark action
2015-01-19 16:02:06 -05:00
ieee802154: 6lowpan: rename process_data and lowpan_process_data
2014-10-27 15:51:16 +01:00
net: ipv6: allow explicitly choosing optimistic addresses
2015-02-05 15:37:41 -08:00
ieee802154: mac802154: remove FSF address
2014-10-25 08:07:30 +02:00
vmci_transport: switch ->enqeue_dgram, ->enqueue_stream and ->dequeue_stream to msghdr
2014-11-24 05:16:42 -05:00
ipsec: Remove obsolete MAX_AH_AUTH_LEN
2014-09-18 10:54:36 +02:00
bonding: cleanup and remove dead code
2015-01-27 17:09:04 -08:00
net: Move bonding headers under include/net
2014-11-10 13:27:49 -05:00
net: Move bonding headers under include/net
2014-11-10 13:27:49 -05:00
net/bonding: Fix potential bad memory access during bonding events
2015-02-09 14:03:53 -08:00
nl80211: add an attribute to allow delaying the first scheduled scan cycle
2015-01-23 10:30:47 +01:00
nl802154: introduce support for cca settings
2014-12-19 00:19:23 +01:00
net: Fix remcsum in GRO path to not change packet
2015-02-11 15:12:09 -08:00
cipso: don't use IPCB() to locate the CIPSO IP option
2015-02-11 14:46:37 -05:00
net: use ktime_get_ns() and ktime_get_real_ns() helpers
2014-08-22 19:57:23 -07:00
fold verify_iovec() into copy_msghdr_from_user()
2014-11-19 16:23:49 -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: dsa: Add support for reading switch registers with ethtool
2014-10-30 14:54:11 -04:00
xfrm: release dst_orig in case of error in xfrm_lookup()
2015-02-12 07:10:56 +01:00
percpu_counter: add @gfp to percpu_counter_init()
2014-09-08 09:51:29 +09:00
ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
2014-04-16 15:05:11 -04:00
flow_keys: n_proto type should be __be16
2015-02-05 00:40:22 -08: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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-01-27 16:59:56 -08:00
openvswitch: Add support for checksums on UDP tunnels.
2015-01-28 23:04:15 -08: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
ieee802154: rework cca setting
2014-12-19 00:19:23 +01:00
ipv6: remove aca_lock spinlock from struct ifacaddr6
2014-10-14 13:15:15 -04:00
ipv4: add a sock pointer to ip_queue_xmit()
2014-04-15 12:58:34 -04:00
ipv6: move INET6_MATCH() to include/net/inet6_hashtables.h
2014-11-05 16:59:04 -05:00
net-timestamp: make tcp_recvmsg call ipv6_recv_error for AF_INET6 socks
2014-11-26 15:45:04 -05:00
net: tcp: add key management to congestion control
2015-01-05 22:55:24 -05:00
tunnel: fix RFC number in comment for INET_ECN_decapsulate()
2014-05-07 15:30:52 -04:00
percpu_counter: add @gfp to percpu_counter_init()
2014-09-08 09:51:29 +09:00
net: Use a more standard macro for INET_ADDR_COOKIE
2014-05-14 16:07:23 -04:00
ip: Add offset parameter to ip_cmsg_recv
2015-01-05 22:44:46 -05:00
inet: move ipv6only in sock_common
2014-07-01 23:46:21 -07:00
inet: remove dead inetpeer sequence code
2014-09-08 16:42:42 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-05 14:33:28 -08:00
net: add gro_compute_pseudo functions
2014-08-24 18:09:23 -07:00
net: fib6: convert cfg metric to u32 outside of table write lock
2015-01-05 22:55:24 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-24 00:32:30 -04:00
tunnels: advertise link netns via netlink
2015-01-19 14:32:03 -05:00
fib_trie: Push rcu_read_lock/unlock to callers
2014-12-31 18:25:54 -05:00
tunnels: advertise link netns via netlink
2015-01-19 14:32:03 -05:00
ipvs: Clean up comment style in ip_vs.h
2014-10-02 18:30:58 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-09 14:35:57 -08:00
switch ipxrtr_route_packet() from iovec to msghdr
2014-11-24 04:28:49 -05: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
llc: Make llc_sap_action_t function pointer arrays const
2014-12-10 15:21:24 -05:00
mac80111: Add BIP-GMAC-128 and BIP-GMAC-256 ciphers
2015-01-27 11:10:13 +01:00
ieee802154: rework cca setting
2014-12-19 00:19:23 +01: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: remove next ptr from struct neigh_table
2014-12-26 17:07:08 -05:00
netns: add rtnl cmd to add and get peer netns ids
2015-01-19 14:21:18 -05:00
netlabel: fix the netlbl_catmap_setlong() dummy function
2014-08-07 20:55:21 -04:00
netlink: make nlmsg_end() and genlmsg_end() void
2015-01-18 01:03:45 -05:00
nl802154: introduce support for cca settings
2014-12-19 00:19:23 +01:00
ip: stash a pointer to msghdr in struct ping_fakehdr
2015-02-04 01:34:14 -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
ipv4: per cpu uncached list
2015-01-15 18:26:16 -05:00
rtnl: add link netns id to interface messages
2015-01-19 14:21:26 -05:00
net: sched: fix panic in rate estimators
2015-01-31 17:49:37 -08: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
memcg: cleanup static keys decrement
2015-02-12 18:54:10 -08:00
swdevice: add new apis to set and del bridge port attributes
2015-02-01 23:16:34 -08:00
ipv4: Namespecify TCP PMTU mechanism
2015-02-09 18:45:00 -08:00
net: Add a software TSO helper API
2014-05-22 14:57:15 -04:00
udp: Generalize skb_udp_segment
2014-10-01 21:35:51 -04:00
udp: Do not require sock in udp_tunnel_xmit_skb
2015-01-24 23:15:40 -08:00
net: switch memcpy_fromiovec()/memcpy_fromiovecend() users to copy_from_iter()
2015-02-04 01:34:15 -05:00
vxlan: fix wrong usage of VXLAN_VID_MASK
2015-03-13 13:08:07 -04:00
net: treewide: Fix typo found in DocBook/networking.xml
2014-09-05 17:35:28 -07:00
xfrm: configure policy hash table thresholds by netlink
2014-09-02 13:37:56 +02:00
ca00942a81