David S. Miller
a8138f42d4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains updates for your net-next tree,
they are:
1) Use kvfree() helper function from x_tables, from Eric Dumazet.
2) Remove extra timer from the conntrack ecache extension, use a
workqueue instead to redeliver lost events to userspace instead,
from Florian Westphal.
3) Removal of the ulog targets for ebtables and iptables. The nflog
infrastructure superseded this almost 9 years ago, time to get rid
of this code.
4) Replace the list of loggers by an array now that we can only have
two possible non-overlapping logger flavours, ie. kernel ring buffer
and netlink logging.
5) Move Eric Dumazet's log buffer code to nf_log to reuse it from
all of the supported per-family loggers.
6) Consolidate nf_log_packet() as an unified interface for packet logging.
After this patch, if the struct nf_loginfo is available, it explicitly
selects the logger that is used.
7) Move ip and ip6 logging code from xt_LOG to the corresponding
per-family loggers. Thus, x_tables and nf_tables share the same code
for packet logging.
8) Add generic ARP packet logger, which is used by nf_tables. The
format aims to be consistent with the output of xt_LOG.
9) Add generic bridge packet logger. Again, this is used by nf_tables
and it routes the packets to the real family loggers. As a result,
we get consistent logging format for the bridge family. The ebt_log
logging code has been intentionally left in place not to break
backward compatibility since the logging output differs from xt_LOG.
10) Update nft_log to explicitly request the required family logger when
needed.
11) Finish nft_log so it supports arp, ip, ip6, bridge and inet families.
Allowing selection between netlink and kernel buffer ring logging.
12) Several fixes coming after the netfilter core logging changes spotted
by robots.
13) Use IS_ENABLED() macros whenever possible in the netfilter tree,
from Duan Jiong.
14) Removal of a couple of unnecessary branch before kfree, from Fabian
Frederick.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-07-20 21:01:43 -07:00
9pnet: p9_client->conn field is unused. Remove it.
2014-03-25 16:38:16 -05:00
Bluetooth: Fix setting HCI_CONNECTABLE from ioctl code
2014-07-09 12:30:18 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2014-07-20 21:01:43 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2014-07-20 21:01:43 -07:00
NFC: Add RAW socket type support for SOCKPROTO_RAW
2014-05-20 00:06:04 +02:00
net: sctp: implement rfc6458, 5.3.6. SCTP_NXTINFO cmsg support
2014-07-16 14:40:03 -07:00
net_sched: act: hide struct tcf_common from API
2014-02-12 19:23:32 -05:00
6lowpan: include net/net_namespace.h on 6lowpan namepsace header
2014-04-20 18:18:55 -04:00
net_sched: act: refuse to remove bound action outside
2014-02-12 19:23:32 -05:00
net: ipv6: Introduce ip6_sk_dst_hoplimit.
2014-04-30 13:31:26 -04:00
ieee802154: add dgram sockopts for security control
2014-05-16 17:23:41 -04:00
vsock: Make transport the proto owner
2014-05-05 13:13:50 -04:00
cfg80211: remove channel_switch combination check
2014-06-25 18:06:20 +02:00
net: Allow csum_add to be provided in arch
2014-05-05 15:26:29 -04:00
cgroup: clean up cgroup_subsys names and initialization
2014-02-08 10:36:58 -05:00
net: introduce reciprocal_scale helper and convert users
2014-01-21 23:17:20 -08: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
Update setapp/getapp prototypes in dcbnl_rtnl_ops to return int instead of u8
2014-07-17 16:02:29 -07: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
net: Move prototype declaration to appropriate header file from decnet/af_decnet.c
2014-02-09 17:32:49 -08:00
net: dsa: add ds_to_priv
2014-04-30 13:31:25 -04:00
ipv4: add a sock pointer to dst->output() path.
2014-04-15 13:47:15 -04:00
net: ethoc: set up MII management bus clock
2014-02-04 20:19:51 -08:00
ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
2014-04-16 15:05:11 -04:00
flow_dissector: Abstract out hash computation
2014-07-07 21:14:20 -07:00
flowcache: Make flow cache name space aware
2014-02-12 07:02:11 +01:00
gre: Call gso_make_checksum
2014-06-04 22:46:38 -07:00
mac80211: propagate STBC / LDPC flags to radiotap
2014-02-06 09:34:58 +01:00
ieee802154: add definitions for link-layer security and header functions
2014-05-15 15:51:42 -04:00
ieee802154, mac802154: implement devkey record option
2014-05-16 17:23:42 -04:00
ipv6: addrconf: implement address generation modes
2014-07-11 15:05:45 -07:00
ipv4: add a sock pointer to ip_queue_xmit()
2014-04-15 12:58:34 -04:00
ipv4: add a sock pointer to ip_queue_xmit()
2014-04-15 12:58:34 -04:00
tunnel: fix RFC number in comment for INET_ECN_decapsulate()
2014-05-07 15:30:52 -04:00
net: Use a more standard macro for INET_ADDR_COOKIE
2014-05-14 16:07:23 -04:00
net: remove inet6_reqsk_alloc
2014-06-27 15:53:35 -07:00
inet: move ipv6only in sock_common
2014-07-01 23:46:21 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-06-03 23:32:12 -07:00
net: Save TX flow hash in sock and set in skbuf on xmit
2014-07-07 21:14:21 -07:00
udp: Generic functions to set checksum
2014-06-04 22:46:38 -07:00
ipv6: do not overwrite inetpeer metrics prematurely
2014-03-27 15:09:07 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-05-24 00:32:30 -04:00
ipv4: add a sock pointer to dst->output() path.
2014-04-15 13:47:15 -04:00
arch: Mass conversion of smp_mb__*()
2014-04-18 14:20:48 +02:00
net: clean up some sparse endianness warnings in ipv6.h
2014-07-16 23:31:38 -07: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
mac80211: implement multi-vif in-place reservations
2014-06-25 18:06:20 +02:00
mac802154: at86rf230: add hw flags and merge ops
2014-07-07 21:29:24 -07:00
neigh: sysctl - simplify address calculation of gc_* variables
2014-07-14 14:32:51 -07:00
6lowpan: nuke net_ieee802154_lowpan() accessor when 6lowpan is disabled
2014-04-24 12:36:00 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
cgroup: clean up cgroup_subsys names and initialization
2014-02-08 10:36:58 -05:00
ieee802154: use ieee802154_addr instead of *_sa variants
2014-03-14 22:15:26 -04:00
ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams
2014-01-19 19:53:18 -08:00
sched, cls: check if we could overwrite actions when changing a filter
2014-04-27 23:42:39 -04:00
net_sched: drr: warn when qdisc is not work conserving
2014-06-11 15:50:59 -07:00
net: Eliminate no_check from protosw
2014-05-23 16:28:53 -04:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
cfg80211: Enable GO operation on additional channels
2014-04-09 10:55:34 +02:00
ipv4: remove ip_rt_dump from route.c
2014-03-24 12:45:01 -04:00
net: rtnetlink - make create_link take name_assign_type
2014-07-15 16:13:07 -07:00
flow_keys: Record IP layer protocol in skb_flow_dissect()
2014-06-23 14:32:19 -07:00
inetpeer: get rid of ip_id_count
2014-06-02 11:00:41 -07:00
net: clean up snmp stats code
2014-05-07 16:06:05 -04:00
udp: Use hash2 for long hash1 chains in __udp*_lib_mcast_deliver.
2014-07-16 23:29:52 -07:00
tcp: Remove unnecessary arg from tcp_enter_cwr and tcp_init_cwnd_reduction
2014-07-15 16:19:36 -07:00
ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams
2014-01-19 19:53:18 -08:00
net: Add a software TSO helper API
2014-05-22 14:57:15 -04:00
udp: Add function to make source port for UDP tunnels
2014-07-07 21:14:21 -07:00
udp: Add udp_sock_create for UDP tunnels to open listener socket
2014-07-14 16:12:15 -07:00
vxlan: Call udp_flow_src_port
2014-07-07 21:14:21 -07:00
wimax: Spelling s/than/that/, wording s/destinatary/recipient/
2014-05-05 15:37:55 +02:00
ieee802154: add netlink APIs for smartMAC configuration
2014-02-17 16:42:39 -05:00
xfrm: Remove useless xfrm_audit struct.
2014-04-23 08:21:04 +02:00
a8138f42d4