From dc8f25b61aebdc94ef51de56f74da481e571a8da Mon Sep 17 00:00:00 2001 From: Luotao Fu Date: Mon, 23 Nov 2009 15:36:38 +0100 Subject: [PATCH] switch netif_up/down to internal static function Signed-off-by: Luotao Fu --- include/socketcan_netlink.h | 3 --- src/socketcan_netlink.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/include/socketcan_netlink.h b/include/socketcan_netlink.h index 330d6da..9f8a3a9 100644 --- a/include/socketcan_netlink.h +++ b/include/socketcan_netlink.h @@ -27,9 +27,6 @@ #define GET_BITTIMING 3 #define GET_CTRLMODE 4 -int netif_down(int fd, const char *name); -int netif_up(int fd, const char *name); - int scan_set_restart(const char *name); int scan_set_bitrate(const char *name, __u32 bitrate); int scan_set_restart_ms(const char *name, __u32 restart_ms); diff --git a/src/socketcan_netlink.c b/src/socketcan_netlink.c index 405e234..d13c8df 100644 --- a/src/socketcan_netlink.c +++ b/src/socketcan_netlink.c @@ -459,6 +459,16 @@ static int do_set_nl_link(int fd, __u8 if_state, const char *name, return send_mod_request(fd, &req.n); } +static int netif_up(int fd, const char *name) +{ + return do_set_nl_link(fd, IF_UP, name, NULL); +} + +static int netif_down(int fd, const char *name) +{ + return do_set_nl_link(fd, IF_DOWN, name, NULL); +} + static int set_link(const char *name, struct req_info *req_info) { int fd; @@ -486,16 +496,6 @@ err_out: return err; } -int netif_up(int fd, const char *name) -{ - return do_set_nl_link(fd, IF_UP, name, NULL); -} - -int netif_down(int fd, const char *name) -{ - return do_set_nl_link(fd, IF_DOWN, name, NULL); -} - int scan_set_restart(const char *name) { int fd;