/flowtop/

git://git.distanz.ch/linux/net-next.git' title='net-next.git Git repository'/>
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/bridge/Makefile5
-rw-r--r--net/bridge/br_netlink.c140
-rw-r--r--net/bridge/br_netlink_tunnel.c296
-rw-r--r--net/bridge/br_private.h10
-rw-r--r--net/bridge/br_private_tunnel.h72
-rw-r--r--net/bridge/br_vlan.c17
-rw-r--r--net/bridge/br_vlan_tunnel.c149
7 files changed, 641 insertions, 48 deletions
diff --git a/net/bridge/Makefile b/net/bridge/Makefile