Page MenuHomeFreeBSD
Files F141039680

D14873.diff
No OneTemporary
Actions

D14873.diff
View Options

Index: head/sys/net/if_arcsubr.c
===================================================================
--- head/sys/net/if_arcsubr.c
+++ head/sys/net/if_arcsubr.c
@@ -681,12 +681,7 @@
break;
case SIOCGIFADDR:
- {
- struct sockaddr *sa;
-
- sa = (struct sockaddr *) &ifr->ifr_data;
- *(u_int8_t *)sa->sa_data = ARC_LLADDR(ifp);
- }
+ ifr->ifr_addr.sa_data[0] = ARC_LLADDR(ifp);
break;
case SIOCADDMULTI:
Index: head/sys/net/if_ethersubr.c
===================================================================
--- head/sys/net/if_ethersubr.c
+++ head/sys/net/if_ethersubr.c
@@ -1108,13 +1108,8 @@
break;
case SIOCGIFADDR:
- {
- struct sockaddr *sa;
-
- sa = (struct sockaddr *) & ifr->ifr_data;
- bcopy(IF_LLADDR(ifp),
- (caddr_t) sa->sa_data, ETHER_ADDR_LEN);
- }
+ bcopy(IF_LLADDR(ifp), &ifr->ifr_addr.sa_data[0],
+ ETHER_ADDR_LEN);
break;
case SIOCSIFMTU:
Index: head/sys/net/if_fddisubr.c
===================================================================
--- head/sys/net/if_fddisubr.c
+++ head/sys/net/if_fddisubr.c
@@ -558,14 +558,9 @@
break;
}
break;
- case SIOCGIFADDR: {
- struct sockaddr *sa;
-
- sa = (struct sockaddr *) & ifr->ifr_data;
- bcopy(IF_LLADDR(ifp),
- (caddr_t) sa->sa_data, FDDI_ADDR_LEN);
-
- }
+ case SIOCGIFADDR:
+ bcopy(IF_LLADDR(ifp), &ifr->ifr_addr.sa_data[0],
+ FDDI_ADDR_LEN);
break;
case SIOCSIFMTU:
/*
Index: head/sys/net/if_fwsubr.c
===================================================================
--- head/sys/net/if_fwsubr.c
+++ head/sys/net/if_fwsubr.c
@@ -662,13 +662,8 @@
break;
case SIOCGIFADDR:
- {
- struct sockaddr *sa;
-
- sa = (struct sockaddr *) & ifr->ifr_data;
- bcopy(&IFP2FWC(ifp)->fc_hwaddr,
- (caddr_t) sa->sa_data, sizeof(struct fw_hwaddr));
- }
+ bcopy(&IFP2FWC(ifp)->fc_hwaddr, &ifr->ifr_addr.sa_data[0],
+ sizeof(struct fw_hwaddr));
break;
case SIOCSIFMTU:
Index: head/sys/net/if_iso88025subr.c
===================================================================
--- head/sys/net/if_iso88025subr.c
+++ head/sys/net/if_iso88025subr.c
@@ -173,13 +173,9 @@
}
break;
- case SIOCGIFADDR: {
- struct sockaddr *sa;
-
- sa = (struct sockaddr *) & ifr->ifr_data;
- bcopy(IF_LLADDR(ifp),
- (caddr_t) sa->sa_data, ISO88025_ADDR_LEN);
- }
+ case SIOCGIFADDR:
+ bcopy(IF_LLADDR(ifp), &ifr->ifr_addr.sa_data[0],
+ ISO88025_ADDR_LEN);
break;
case SIOCSIFMTU:
Index: head/sys/net/if_vlan.c
===================================================================
--- head/sys/net/if_vlan.c
+++ head/sys/net/if_vlan.c
@@ -1790,12 +1790,8 @@
#endif
break;
case SIOCGIFADDR:
- {
- struct sockaddr *sa;
-
- sa = (struct sockaddr *)&ifr->ifr_data;
- bcopy(IF_LLADDR(ifp), sa->sa_data, ifp->if_addrlen);
- }
+ bcopy(IF_LLADDR(ifp), &ifr->ifr_addr.sa_data[0],
+ ifp->if_addrlen);
break;
case SIOCGIFMEDIA:
VLAN_SLOCK();
Index: head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
===================================================================
--- head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ head/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -320,13 +320,8 @@
break;
case SIOCGIFADDR:
- {
- struct sockaddr *sa;
-
- sa = (struct sockaddr *) & ifr->ifr_data;
- bcopy(IF_LLADDR(ifp),
- (caddr_t) sa->sa_data, INFINIBAND_ALEN);
- }
+ bcopy(IF_LLADDR(ifp), &ifr->ifr_addr.sa_data[0],
+ INFINIBAND_ALEN);
break;
case SIOCSIFMTU:

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 1, 2:04 AM (11 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27427377
Default Alt Text
D14873.diff (3 KB)

Event Timeline