aboutsummaryrefslogtreecommitdiff
path: root/networking/ifplugd.c
diff options
context:
space:
mode:
Diffstat (limited to 'networking/ifplugd.c')
-rw-r--r--networking/ifplugd.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 58f56dbf1..8dd0a5bd8 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -131,18 +131,21 @@ static int network_ioctl(int request, void* data, const char *errmsg)
131 131
132static smallint detect_link_mii(void) 132static smallint detect_link_mii(void)
133{ 133{
134 struct ifreq ifreq; 134 /* char buffer instead of bona-fide struct avoids aliasing warning */
135 struct mii_ioctl_data *mii = (void *)&ifreq.ifr_data; 135 char buf[sizeof(struct ifreq)];
136 struct ifreq *const ifreq = (void *)buf;
136 137
137 set_ifreq_to_ifname(&ifreq); 138 struct mii_ioctl_data *mii = (void *)&ifreq->ifr_data;
139
140 set_ifreq_to_ifname(ifreq);
138 141
139 if (network_ioctl(SIOCGMIIPHY, &ifreq, "SIOCGMIIPHY") < 0) { 142 if (network_ioctl(SIOCGMIIPHY, ifreq, "SIOCGMIIPHY") < 0) {
140 return IFSTATUS_ERR; 143 return IFSTATUS_ERR;
141 } 144 }
142 145
143 mii->reg_num = 1; 146 mii->reg_num = 1;
144 147
145 if (network_ioctl(SIOCGMIIREG, &ifreq, "SIOCGMIIREG") < 0) { 148 if (network_ioctl(SIOCGMIIREG, ifreq, "SIOCGMIIREG") < 0) {
146 return IFSTATUS_ERR; 149 return IFSTATUS_ERR;
147 } 150 }
148 151
@@ -151,18 +154,21 @@ static smallint detect_link_mii(void)
151 154
152static smallint detect_link_priv(void) 155static smallint detect_link_priv(void)
153{ 156{
154 struct ifreq ifreq; 157 /* char buffer instead of bona-fide struct avoids aliasing warning */
155 struct mii_ioctl_data *mii = (void *)&ifreq.ifr_data; 158 char buf[sizeof(struct ifreq)];
159 struct ifreq *const ifreq = (void *)buf;
156 160
157 set_ifreq_to_ifname(&ifreq); 161 struct mii_ioctl_data *mii = (void *)&ifreq->ifr_data;
162
163 set_ifreq_to_ifname(ifreq);
158 164
159 if (network_ioctl(SIOCDEVPRIVATE, &ifreq, "SIOCDEVPRIVATE") < 0) { 165 if (network_ioctl(SIOCDEVPRIVATE, ifreq, "SIOCDEVPRIVATE") < 0) {
160 return IFSTATUS_ERR; 166 return IFSTATUS_ERR;
161 } 167 }
162 168
163 mii->reg_num = 1; 169 mii->reg_num = 1;
164 170
165 if (network_ioctl(SIOCDEVPRIVATE+1, &ifreq, "SIOCDEVPRIVATE+1") < 0) { 171 if (network_ioctl(SIOCDEVPRIVATE+1, ifreq, "SIOCDEVPRIVATE+1") < 0) {
166 return IFSTATUS_ERR; 172 return IFSTATUS_ERR;
167 } 173 }
168 174