Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

ifplugd: fix warnings

Browse Source
This commit is contained in:
Denys Vlasenko 2009-05-01 09:04:25 +02:00
parent 44d1989997
commit 9c35a1cfb6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
networking/ifplugd.c
View File

@ -9,6 +9,7 @@
#include "libbb.h" #include "libbb.h"
#include <linux/if.h> #include <linux/if.h>
#include <linux/mii.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <linux/netlink.h> #include <linux/netlink.h>
@ -310,6 +311,7 @@ static void maybe_up_new_iface(void)
static smallint detect_link_mii(void) static smallint detect_link_mii(void)
{ {
struct ifreq ifreq; struct ifreq ifreq;
struct mii_ioctl_data *mii = (void *)&ifreq.ifr_data;
set_ifreq_to_ifname(&ifreq); set_ifreq_to_ifname(&ifreq);
@ -318,20 +320,20 @@ static smallint detect_link_mii(void)
return IFSTATUS_ERR; return IFSTATUS_ERR;
} }
((unsigned short*)&ifreq.ifr_data)[1] = 1; mii->reg_num = 1;
if (network_ioctl(SIOCGMIIREG, &ifreq) < 0) { if (network_ioctl(SIOCGMIIREG, &ifreq) < 0) {
bb_perror_msg("SIOCGMIIREG failed"); bb_perror_msg("SIOCGMIIREG failed");
return IFSTATUS_ERR; return IFSTATUS_ERR;
} }
return (((unsigned short*)&ifreq.ifr_data)[3] & 0x0004) ? return (mii->val_out & 0x0004) ? IFSTATUS_UP : IFSTATUS_DOWN;
IFSTATUS_UP : IFSTATUS_DOWN;
} }
static smallint detect_link_priv(void) static smallint detect_link_priv(void)
{ {
struct ifreq ifreq; struct ifreq ifreq;
struct mii_ioctl_data *mii = (void *)&ifreq.ifr_data;
set_ifreq_to_ifname(&ifreq); set_ifreq_to_ifname(&ifreq);
@ -340,15 +342,14 @@ static smallint detect_link_priv(void)
return IFSTATUS_ERR; return IFSTATUS_ERR;
} }
((unsigned short*) &ifreq.ifr_data)[1] = 1; mii->reg_num = 1;
if (network_ioctl(SIOCDEVPRIVATE+1, &ifreq) < 0) { if (network_ioctl(SIOCDEVPRIVATE+1, &ifreq) < 0) {
bb_perror_msg("SIOCDEVPRIVATE+1 failed"); bb_perror_msg("SIOCDEVPRIVATE+1 failed");
return IFSTATUS_ERR; return IFSTATUS_ERR;
} }
return (((unsigned short*)&ifreq.ifr_data)[3] & 0x0004) ? return (mii->val_out & 0x0004) ? IFSTATUS_UP : IFSTATUS_DOWN;
IFSTATUS_UP : IFSTATUS_DOWN;
} }
static smallint detect_link_ethtool(void) static smallint detect_link_ethtool(void)
@ -591,6 +592,7 @@ static NOINLINE int netlink_open(void)
return fd; return fd;
} }
#if ENABLE_FEATURE_PIDFILE
static NOINLINE pid_t read_pid(const char *filename) static NOINLINE pid_t read_pid(const char *filename)
{ {
int len; int len;
@ -604,6 +606,7 @@ static NOINLINE pid_t read_pid(const char *filename)
} }
return 0; return 0;
} }
#endif
int ifplugd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ifplugd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ifplugd_main(int argc UNUSED_PARAM, char **argv) int ifplugd_main(int argc UNUSED_PARAM, char **argv)