/net/key/

h/linux/net-next.git' title='net-next.git Git repository'/>
summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/if_bridge.h1
-rw-r--r--include/linux/list.h13
-rw-r--r--include/linux/netdev_features.h2
-rw-r--r--include/linux/netdevice.h3
-rw-r--r--include/linux/netfilter/x_tables.h9
-rw-r--r--include/linux/parman.h76
-rw-r--r--include/linux/skbuff.h32
-rw-r--r--include/linux/tcp.h9
-rw-r--r--include/linux/trace_events.h2
-rw-r--r--include/net/ife.h51
-rw-r--r--include/net/ip_tunnels.h1
-rw-r--r--include/net/ip_vs.h12
-rw-r--r--include/net/netfilter/ipv4/nf_conntrack_ipv4.h1
-rw-r--r--include/net/netfilter/ipv6/nf_conntrack_ipv6.h1
-rw-r--r--include/net/netfilter/nf_conntrack.h17
-rw-r--r--include/net/netfilter/nf_conntrack_core.h2
-rw-r--r--include/net/netfilter/nf_conntrack_l4proto.h2
-rw-r--r--include/net/netfilter/nf_log.h3
-rw-r--r--include/net/netns/conntrack.h16
-rw-r--r--include/net/pkt_cls.h1
-rw-r--r--include/net/tc_act/tc_ife.h3
-rw-r--r--include/trace/trace_events.h4
-rw-r--r--include/uapi/linux/Kbuild1
-rw-r--r--include/uapi/linux/if_bridge.h11
-rw-r--r--include/uapi/linux/if_link.h1
-rw-r--r--include/uapi/linux/ife.h18
-rw-r--r--include/uapi/linux/neighbour.h1
-rw-r--r--include/uapi/linux/netfilter/nf_tables.h5
-rw-r--r--include/uapi/linux/tc_act/tc_ife.h10
29 files changed, 248 insertions, 60 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h