mirror of
https://gitlab.labs.nic.cz/labs/bird.git
synced 2024-05-11 16:54:54 +00:00
Merge branch 'master' into int-new
This commit is contained in:
@@ -933,7 +933,7 @@ kif_do_scan(struct kif_proto *p)
|
||||
/* Kernel sockets */
|
||||
|
||||
static int
|
||||
krt_sock_hook(sock *sk, int size UNUSED)
|
||||
krt_sock_hook(sock *sk, uint size UNUSED)
|
||||
{
|
||||
struct ks_msg msg;
|
||||
int l = read(sk->fd, (char *)&msg, sizeof(msg));
|
||||
@@ -953,7 +953,7 @@ krt_sock_err_hook(sock *sk, int e UNUSED)
|
||||
}
|
||||
|
||||
static sock *
|
||||
krt_sock_open(pool *pool, void *data, int table_id)
|
||||
krt_sock_open(pool *pool, void *data, int table_id UNUSED)
|
||||
{
|
||||
sock *sk;
|
||||
int fd;
|
||||
@@ -1120,7 +1120,7 @@ kif_sys_shutdown(struct kif_proto *p)
|
||||
|
||||
|
||||
struct ifa *
|
||||
kif_get_primary_ip(struct iface *i)
|
||||
kif_get_primary_ip(struct iface *i UNUSED)
|
||||
{
|
||||
#if 0
|
||||
static int fd = -1;
|
||||
|
Reference in New Issue
Block a user