Joe Stringer f88f69dd17 openvswitch: Remove conntrack Kconfig option. ...

There's no particular desire to have conntrack action support in Open
vSwitch as an independently configurable bit, rather just to ensure
there is not a hard dependency. This exposed option doesn't accurately
reflect the conntrack dependency when enabled, so simplify this by
removing the option. Compile the support if NF_CONNTRACK is enabled.

Fixes: 7f8a436eaa ("openvswitch: Add conntrack action")
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2015-09-06 23:48:33 -07:00

..

6lowpan

6lowpan: move module_init into core functionality

2015-08-11 22:05:36 +02:00

9p

9p: ensure err is initialized to 0 in p9_client_read/write

2015-08-22 21:35:02 -04:00

802

net: Kill dev_rebuild_header

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

8021q

net: 8021q: convert to using IFF_NO_QUEUE

2015-08-18 11:55:06 -07:00

appletalk

net: Pass kern from net_proto_family.create to sk_alloc

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

atm

br2684: Remove unnecessary formatting macros b1 and bs

2015-07-31 15:25:52 -07:00

ax25

NET: AX.25: Stop heartbeat timer on disconnect.

2015-07-15 15:59:58 -07:00

batman-adv

batman-adv: turn batadv_neigh_node_get() into local function

2015-08-27 20:15:34 +02:00

bluetooth

Bluetooth: Fix SCO link type handling on connection complete

2015-08-28 21:03:00 +02:00

bridge

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

2015-08-28 16:29:59 -07:00

caif

net: caif: convert to using IFF_NO_QUEUE

2015-08-18 11:55:07 -07:00

can

can: replace timestamp as unique skb attribute

2015-07-12 21:13:22 +02:00

ceph

libceph: treat sockaddr_storage with uninitialized family as blank

2015-07-09 20:30:34 +03:00

core

sock, diag: fix panic in sock_diag_put_filterinfo

2015-09-02 11:29:29 -07:00

dcb

net/dcb: Add IEEE QCN attribute

2015-03-06 21:50:02 -05:00

dccp

tcp: fix recv with flags MSG_WAITALL | MSG_PEEK

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

decnet

net: Pass kern from net_proto_family.create to sk_alloc

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

dns_resolver

…

dsa

net: dsa: Allow DSA and CPU ports to have a phy-mode property

2015-08-31 14:48:02 -07:00

ethernet

flow_dissector: Add flags argument to skb_flow_dissector functions

2015-09-01 15:06:22 -07:00

hsr

net: hsr: convert to using IFF_NO_QUEUE

2015-08-18 11:55:07 -07:00

ieee802154

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

2015-08-29 13:15:03 -07:00

ipv4

netfilter: nf_dup{4, 6}: fix build error when nf_conntrack disabled

2015-09-02 16:28:06 -07:00

ipv6

net/ipv6: Correct PIM6 mrt_lock handling

2015-09-05 17:31:30 -07:00

ipx

net: Pass kern from net_proto_family.create to sk_alloc

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

irda

irda: use msecs_to_jiffies for conversion to jiffies

2015-05-25 17:46:21 -04:00

iucv

net: Pass kern from net_proto_family.create to sk_alloc

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

key

net: Fix RCU splat in af_key

2015-08-24 14:48:10 -07:00

l2tp

net: Modify sk_alloc to not reference count the netns of kernel sockets.

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

lapb

…

llc

tcp: fix recv with flags MSG_WAITALL | MSG_PEEK

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

mac80211

mac80211: reject software RSSI CQM with beacon filtering

2015-09-04 15:23:22 +02:00

mac802154

ieee802154: add ack request default handling

2015-08-10 20:43:06 +02:00

mpls

mpls: fix mpls_net_init memory leak

2015-08-31 12:45:09 -07:00

netfilter

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

2015-09-05 21:57:42 -07:00

netlabel

netlink: implement nla_put_in_addr and nla_put_in6_addr

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

netlink

netlink: rx mmap: fix POLLIN condition

2015-08-30 21:55:51 -07:00

netrom

netfilter: Remove spurios included of netfilter.h

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

nfc

nfc: netlink: Add capability to reply to vendor_cmd with data

2015-08-20 22:00:11 +02:00

openvswitch

openvswitch: Remove conntrack Kconfig option.

2015-09-06 23:48:33 -07:00

packet

packet: add extended BPF fanout mode

2015-08-17 14:22:48 -07:00

phonet

net: Pass kern from net_proto_family.create to sk_alloc

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

rds

RDS: rds_conn_lookup() should factor in the struct net for a match

2015-09-05 22:04:58 -07:00

rfkill

rfkill: Copy "all" global state to other types

2015-09-04 14:26:56 +02:00

rose

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

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

rxrpc

net: Pass kern from net_proto_family.create to sk_alloc

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

sched

flow_dissector: Add flags argument to skb_flow_dissector functions

2015-09-01 15:06:22 -07:00

sctp

sctp: add routing output fallback

2015-09-03 15:43:05 -07:00

sunrpc

Merge tag 'nfs-for-4.2-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2015-07-28 09:37:44 -07:00

switchdev

switchdev: fix return value of switchdev_port_fdb_dump in case of error

2015-09-05 22:02:11 -07:00

tipc

tipc: fix stale link problem during synchronization

2015-08-23 16:14:45 -07:00

unix

net/unix: support SCM_SECURITY for stream sockets

2015-06-10 22:49:20 -07:00

vmw_vsock

net: Pass kern from net_proto_family.create to sk_alloc

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

wimax

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

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

wireless

cfg80211: regulatory: restore proper user alpha2

2015-09-04 14:29:25 +02:00

x25

net: Pass kern from net_proto_family.create to sk_alloc

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

xfrm

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

2015-09-03 08:08:17 -07:00

compat.c

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

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

Kconfig

lwtunnel: infrastructure for handling light weight tunnels like mpls

2015-07-21 10:39:03 -07:00

Makefile

mpls: Refactor how the mpls module is built

2015-03-04 00:26:06 -05:00

socket.c

net: Add a struct net parameter to sock_create_kern

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

sysctl_net.c

…