aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/net/tipc/net.h
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-11-19 21:32:12 +1100
committerJames Morris <james.l.morris@oracle.com>2014-11-19 21:32:12 +1100
commitb10778a00d40b3d9fdaaf5891e802794781ff71c (patch)
tree6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/tipc/net.h
parentintegrity: do zero padding of the key id (diff)
parentLinux 3.17 (diff)
downloadwireguard-linux-b10778a00d40b3d9fdaaf5891e802794781ff71c.tar.xz
wireguard-linux-b10778a00d40b3d9fdaaf5891e802794781ff71c.zip
Merge commit 'v3.17' into next
Diffstat (limited to 'net/tipc/net.h')
-rw-r--r--net/tipc/net.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/tipc/net.h b/net/tipc/net.h
index c6c2b46f7c28..59ef3388be2c 100644
--- a/net/tipc/net.h
+++ b/net/tipc/net.h
@@ -37,8 +37,6 @@
#ifndef _TIPC_NET_H
#define _TIPC_NET_H
-void tipc_net_route_msg(struct sk_buff *buf);
-
int tipc_net_start(u32 addr);
void tipc_net_stop(void);