Liping Zhang 074c908972 netfilter: xt_quota2: make quota2_log work well ...

In upstream commit 7200135bc1
(netfilter: kill ulog targets)
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7200135bc1e6

ipt_ULOG target was removed, meanwhile, the IP_NF_TARGET_ULOG Kconfig
and ipt_ULOG.h header file were removed too. This causes we cannot enable
QUOTA2_LOG, and netd complains this error: "Unable to open quota socket".
So when we reach the quota2 limit, userspace will not be notified with
this event.

Since IP_NF_TARGET_ULOG was removed, we need not depend on
"IP_NF_TARGET_ULOG=n", and for compatibility, add ulog_packet_msg_t
related definitions copied from "ipt_ULOG.h".

Change-Id: I38132efaabf52bea75dfd736ce734a1b9690e87e
Reported-by: Samboo Shen <samboo.shen@spreadtrum.com>
Signed-off-by: Liping Zhang <liping.zhang@spreadtrum.com>

2016-06-29 11:29:56 -07:00

..

6lowpan

6lowpan: put mcast compression in an own function

2015-10-21 00:49:25 +02:00

9p

IB/cma: Add support for network namespaces

2015-10-28 12:32:48 -04:00

802

net: Kill dev_rebuild_header

2015-03-02 16:43:41 -05:00

8021q

vlan: Do not put vlan headers back on bridge and macvlan ports

2015-11-17 14:38:35 -05:00

appletalk

net: Pass kern from net_proto_family.create to sk_alloc

2015-05-11 10:50:17 -04:00

atm

atm: deal with setting entry before mkip was called

2015-09-17 22:13:32 -07:00

ax25

net: add validation for the socket syscall protocol argument

2015-12-14 16:09:30 -05:00

batman-adv

batman-adv: Fix invalid stack access in batadv_dat_select_candidates

2015-12-07 22:40:21 +08:00

bluetooth

Paranoid network.

2016-02-16 13:51:13 -08:00

bridge

bridge: Have tx_bytes count headers like rx_bytes.

2016-02-16 13:51:46 -08:00

caif

net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA

2015-12-01 15:45:05 -05:00

can

can: avoid using timeval for uapi

2015-10-13 17:42:34 +02:00

ceph

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2015-11-13 09:24:40 -08:00

core

UPSTREAM: net: fix infoleak in rtnetlink

2016-06-24 21:18:38 +00:00

dcb

net/dcb: make dcbnl.c explicitly non-modular

2015-10-09 07:52:27 -07:00

dccp

ipv6: kill sk_dst_lock

2015-12-03 11:32:06 -05:00

decnet

net: add validation for the socket syscall protocol argument

2015-12-14 16:09:30 -05:00

dns_resolver

net: dns_resolver: convert time_t to time64_t

2015-11-18 16:27:46 -05:00

dsa

net: dsa: use switchdev obj for VLAN add/del ops

2015-11-01 15:56:11 -05:00

ethernet

net: help compiler generate better code in eth_get_headlen

2015-09-28 22:51:15 -07:00

hsr

net/hsr: fix a warning message

2015-11-23 14:56:15 -05:00

ieee802154

net: fix percpu memory leaks

2015-11-02 22:47:14 -05:00

ipv4

Revert "misc: uidstat: Adding uid stat driver to collect network statistics."

2016-04-25 22:19:46 +05:30

ipv6

Revert "net: socket ioctl to reset connections matching local address"

2016-04-22 11:04:14 -07:00

ipx

net: Pass kern from net_proto_family.create to sk_alloc

2015-05-11 10:50:17 -04:00

irda

net: add validation for the socket syscall protocol argument

2015-12-14 16:09:30 -05:00

iucv

net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA

2015-12-01 15:45:05 -05:00

key

af_key: fix two typos

2015-10-23 03:05:19 -07:00

l2tp

ipv6: add complete rcu protection around np->opt

2015-12-02 23:37:16 -05:00

l3mdev

net: Add netif_is_l3_slave

2015-10-07 04:27:43 -07:00

lapb

…

llc

tcp: fix recv with flags MSG_WAITALL | MSG_PEEK

2015-07-27 01:06:53 -07:00

mac80211

UPSTREAM: mac80211: fix "warning: ‘target_metric’ may be used uninitialized"

2016-05-17 17:36:19 +00:00

mac802154

mac802154: llsec: use kzfree

2015-10-21 00:49:24 +02:00

mpls

mpls: make via address optional for multipath routes

2015-12-12 00:43:44 -05:00

netfilter

netfilter: xt_quota2: make quota2_log work well

2016-06-29 11:29:56 -07:00

netlabel

netlink: implement nla_put_in_addr and nla_put_in6_addr

2015-03-31 13:58:35 -04:00

netlink

mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd

2015-11-06 17:50:42 -08:00

netrom

netfilter: Remove spurios included of netfilter.h

2015-06-18 21:14:32 +02:00

nfc

net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA

2015-12-01 15:45:05 -05:00

openvswitch

openvswitch: Fix template leak in error cases.

2015-12-29 15:27:52 -05:00

packet

packet: Allow packets with only a header (but no payload)

2015-11-29 22:17:17 -05:00

phonet

net: Pass kern from net_proto_family.create to sk_alloc

2015-05-11 10:50:17 -04:00

rds

RDS: fix race condition when sending a message on unbound socket

2015-11-24 17:20:09 -05:00

rfkill

rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down

2016-02-16 13:51:46 -08:00

rose

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-06-24 02:58:51 -07:00

rxrpc

net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA

2015-12-01 15:45:05 -05:00

sched

net: sched: fix missing free per cpu on qstats

2016-01-06 01:40:21 -05:00

sctp

sctp: sctp should release assoc when sctp_make_abort_user return NULL in sctp_close

2015-12-30 16:57:16 -05:00

sunrpc

sched/wait: Fix the signal handling fix

2015-12-13 14:30:59 -08:00

switchdev

switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion

2015-11-03 13:39:21 -05:00

tipc

tipc: fix error handling of expanding buffer headroom

2015-11-24 11:26:19 -05:00

unix

af_unix: Fix splice-bind deadlock

2016-01-04 23:22:49 -05:00

vmw_vsock

VSOCK: call sk->sk_data_ready() on accept()

2015-11-04 22:03:10 -05:00

wimax

net:wimax: Fix doucble word "the the" in networking.xml

2015-08-09 22:43:52 -07:00

wireless

net: wireless: Decrease scan entry expiration to avoid stall results

2016-02-16 13:51:47 -08:00

x25

net: Pass kern from net_proto_family.create to sk_alloc

2015-05-11 10:50:17 -04:00

xfrm

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

2015-12-22 16:26:31 -05:00

compat.c

net: switch importing msghdr from userland to {compat_,}import_iovec()

2015-04-09 00:02:26 -04:00

Kconfig

Revert "net: activity_stats: Add statistics for network transmission activity"

2016-04-25 22:19:46 +05:30

Makefile

Revert "net: activity_stats: Add statistics for network transmission activity"

2016-04-25 22:19:46 +05:30

socket.c

net, socket, socket_wq: fix missing initialization of flags

2015-12-30 16:38:01 -05:00

sysctl_net.c

net: sysctl: fix a kmemleak warning

2015-10-23 06:22:08 -07:00