David S. Miller
90b2621fd4
Merge branch 'master' of git://1984.lsi.us.es/nf ...
Pablo Neira Ayuso says:
====================
The following patchset contains 7 Netfilter/IPVS fixes for 3.9-rc, they are:
* Restrict IPv6 stateless NPT targets to the mangle table. Many users are
complaining that this target does not work in the nat table, which is the
wrong table for it, from Florian Westphal.
* Fix possible use before initialization in the netns init path of several
conntrack protocol trackers (introduced recently while improving conntrack
netns support), from Gao Feng.
* Fix incorrect initialization of copy_range in nfnetlink_queue, spotted
by Eric Dumazet during the NFWS2013, patch from myself.
* Fix wrong calculation of next SCTP chunk in IPVS, from Julian Anastasov.
* Remove rcu_read_lock section in IPVS while calling ipv4_update_pmtu
not required anymore after change introduced in 3.7, again from Julian.
* Fix SYN looping in IPVS state sync if the backup is used a real server
in DR/TUN modes, this required a new /proc entry to disable the director
function when acting as backup, also from Julian.
* Remove leftover IP_NF_QUEUE Kconfig after ip_queue removal, noted by
Paul Bolle.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-03-20 10:23:52 -04:00
9p: turn fid->dlist into hlist
2013-02-27 22:51:08 -05:00
Bluetooth: Keep track of UUID type upon addition
2013-02-01 15:50:17 -02:00
treewide: Replace incomming with incoming in all comments and strings
2013-01-03 16:15:49 +01:00
netfilter: nf_ct_helper: better logging for dropped packets
2013-02-19 02:48:05 +01:00
xfrm: make gc_thresh configurable in all namespaces
2013-02-06 11:36:29 +01:00
NFC: Initial Secure Element API
2013-01-10 00:51:54 +01:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
act_police: move struct tcf_police to act_police.c
2013-02-12 18:59:45 -05:00
ipv4: introduce address lifetime
2013-01-29 13:59:57 -05:00
unix: Remove unused field from unix_sock
2012-10-21 20:37:06 -04:00
net: Dont use ifindices in hash fns
2012-08-09 16:18:06 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-02-18 13:47:13 -05:00
net: core: add function for incremental IPv6 pseudo header checksum updates
2012-08-30 03:00:16 +02:00
net: Update args to dummy sock_update_classid().
2012-10-26 05:07:00 -04:00
codel: refine one condition to avoid a nul rec_inv_sqrt
2012-08-10 16:52:54 -07:00
decnet: use correct RCU API to deref sk_dst_cache field
2013-01-28 00:15:27 -05:00
ipv6: Optimize ipv6_change_dsfield().
2013-01-09 23:59:53 -08:00
Fix dst_neigh_lookup/dst_neigh_lookup_skb return value handling bug
2013-03-15 09:06:58 -04:00
net: Fix warnings in dst_ops.h
2012-07-19 10:43:03 -07:00
ipv4: Add FLOWI_FLAG_KNOWN_NH
2012-10-08 17:42:36 -04:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
gro: Fix kcalloc argument order
2013-01-27 22:46:33 -05:00
ipv4: fix error handling in icmp_protocol.
2013-02-22 15:10:18 -05:00
mac80211: support (partial) VHT radiotap information
2012-11-27 11:56:18 +01:00
ipv6: Add helper inet6_csk_update_pmtu().
2012-07-16 03:44:56 -07:00
ipv6: use a stronger hash for tcp
2013-02-21 18:15:58 -05:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sock
2012-12-14 13:14:07 -05:00
tunnel: drop packet if ECN present with not-ECT
2012-09-27 18:12:37 -04:00
inet: limit length of fragment queue hash table bucket lists
2013-03-19 10:28:36 -04:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
ipv6: use a stronger hash for tcp
2013-02-21 18:15:58 -05:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
ipv4: Maintain redirect and PMTU info in struct rtable again.
2012-07-10 22:40:14 -07:00
ipv4: Add a socket release callback for datagram sockets
2013-01-21 14:17:05 -05:00
ipv6: move csum_ipv6_magic() and udp6_csum_init() into static library
2013-01-08 17:56:10 -08:00
ipv6: fix race condition regarding dst->expires and dst->from.
2013-02-20 15:11:45 -05:00
ipv6: Remove unused neigh argument for icmp6_dst_alloc() and its callers.
2013-01-18 14:41:13 -05:00
gre: Support GRE over IPv6
2012-08-14 14:28:32 -07:00
ipv4: fix definition of FIB_TABLE_HASHSZ
2013-03-13 10:47:09 -04:00
ipvs: add backup_only flag to avoid loops
2013-03-19 21:21:51 +09:00
IP_GRE: Fix IP-Identification.
2013-02-25 15:47:41 -05:00
ipv6: use a stronger hash for tcp
2013-02-21 18:15:58 -05:00
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
2012-09-17 13:13:24 -04:00
mac80211: stop modifying HT SMPS capability
2013-02-15 09:41:41 +01:00
net/802: Implement Multiple Registration Protocol (MRP)
2013-02-10 20:37:22 -05:00
ndisc: Move ndisc_opt_addr_space() to include/net/ndisc.h.
2013-01-21 13:33:14 -05:00
net neighbour, decnet: Ensure to align device private data on preferred alignment.
2013-02-11 00:21:44 -05:00
proc: Usable inode numbers for the namespace file descriptors.
2012-11-20 04:19:49 -08:00
ipv6 netevent: Remove old_neigh from netevent_redirect.
2013-01-14 15:04:59 -05:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netprio_cgroup: use cgroup->id instead of cgroup_netprio_state->prioidx
2012-11-22 07:32:47 -08:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
pkt_sched: namespace aware act_mirred
2013-01-14 15:09:36 -05:00
sch_api: introduce qdisc_watchdog_schedule_ns()
2013-02-12 18:59:45 -05:00
net: Remove code duplication between offload structures
2012-11-15 17:39:51 -05:00
regulatory: use RCU to protect last_request
2013-01-03 13:01:30 +01:00
tcp: better retrans tracking for defer-accept
2012-11-03 14:45:00 -04:00
ipv4: avoid a test in ip_rt_put()
2012-11-03 14:59:04 -04:00
rtnelink: remove unused parameter from rtnl_create_link().
2012-11-30 12:24:40 -05:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
net: Remove unnecessary NULL check in scm_destroy().
2012-09-24 15:52:33 -04:00
net: avoid reloads in SNMP_UPD_PO_STATS
2012-08-06 13:40:47 -07:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
tcp: avoid wakeups for pure ACK
2013-02-28 15:37:29 -05:00
ipv6: rename datagram_send_ctl and datagram_recv_ctl
2013-01-31 13:53:08 -05:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2013-02-14 13:29:20 -05:00
90b2621fd4