diff options
| -rw-r--r-- | include/netlink/socket.h | 3 | ||||
| -rw-r--r-- | src/disabled-nl-qdisc-add.c | 2 | ||||
| -rw-r--r-- | src/nl-addr-delete.c | 2 | ||||
| -rw-r--r-- | src/nl-addr-list.c | 2 | ||||
| -rw-r--r-- | src/nl-fib-lookup.c | 2 | ||||
| -rw-r--r-- | src/nl-route-add.c | 2 | ||||
| -rw-r--r-- | src/nl-route-delete.c | 2 | ||||
| -rw-r--r-- | tests/test-socket-creation.c | 2 |
8 files changed, 7 insertions, 10 deletions
diff --git a/include/netlink/socket.h b/include/netlink/socket.h index 4c0589d..7e71aed 100644 --- a/include/netlink/socket.h +++ b/include/netlink/socket.h @@ -19,9 +19,6 @@ extern "C" { #endif -/* backwards compatibility for now */ -#define nl_handle nl_sock - extern struct nl_sock * nl_socket_alloc(void); extern struct nl_sock * nl_socket_alloc_cb(struct nl_cb *); extern void nl_socket_free(struct nl_sock *); diff --git a/src/disabled-nl-qdisc-add.c b/src/disabled-nl-qdisc-add.c index be19f9b..a1fab4e 100644 --- a/src/disabled-nl-qdisc-add.c +++ b/src/disabled-nl-qdisc-add.c @@ -125,7 +125,7 @@ usage: int main(int argc, char *argv[]) { - struct nl_handle *nlh; + struct nl_sock *nlh; struct rtnl_qdisc *qdisc; uint32_t handle, parent; int err = 1; diff --git a/src/nl-addr-delete.c b/src/nl-addr-delete.c index 4211191..f185563 100644 --- a/src/nl-addr-delete.c +++ b/src/nl-addr-delete.c @@ -10,7 +10,7 @@ #include "addr-utils.h" -static struct nl_handle *sock; +static struct nl_sock *sock; static int interactive = 0, default_yes = 0, quiet = 0; static int deleted = 0; diff --git a/src/nl-addr-list.c b/src/nl-addr-list.c index 0a3fb64..1393f6e 100644 --- a/src/nl-addr-list.c +++ b/src/nl-addr-list.c @@ -108,7 +108,7 @@ static void env_dump(struct nl_object *obj, void *arg) int main(int argc, char *argv[]) { - struct nl_handle *sock; + struct nl_sock *sock; struct rtnl_addr *addr; struct nl_cache *link_cache, *addr_cache; struct nl_dump_params params = { diff --git a/src/nl-fib-lookup.c b/src/nl-fib-lookup.c index c514211..328e60f 100644 --- a/src/nl-fib-lookup.c +++ b/src/nl-fib-lookup.c @@ -25,7 +25,7 @@ static void print_usage(void) int main(int argc, char *argv[]) { - struct nl_handle *nlh; + struct nl_sock *nlh; struct nl_cache *result; struct flnl_request *request; struct nl_addr *addr; diff --git a/src/nl-route-add.c b/src/nl-route-add.c index 47475a1..a1ab7f3 100644 --- a/src/nl-route-add.c +++ b/src/nl-route-add.c @@ -49,7 +49,7 @@ static void print_usage(void) int main(int argc, char *argv[]) { - struct nl_handle *sock; + struct nl_sock *sock; struct rtnl_route *route; struct nl_dump_params dp = { .dp_type = NL_DUMP_LINE, diff --git a/src/nl-route-delete.c b/src/nl-route-delete.c index 81cec58..aca3a39 100644 --- a/src/nl-route-delete.c +++ b/src/nl-route-delete.c @@ -13,7 +13,7 @@ static int interactive = 0, default_yes = 0, quiet = 0; static int deleted = 0; -static struct nl_handle *sock; +static struct nl_sock *sock; static void print_version(void) { diff --git a/tests/test-socket-creation.c b/tests/test-socket-creation.c index 4066eef..a170ccd 100644 --- a/tests/test-socket-creation.c +++ b/tests/test-socket-creation.c @@ -2,7 +2,7 @@ int main(int argc, char *argv[]) { - struct nl_handle *h[1025]; + struct nl_sock *h[1025]; int i; h[0] = nl_handle_alloc(); |