diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-12-12 02:18:34 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-12-12 02:18:34 +0000 |
| commit | 42f88ff4e84da6f73f65569a6ce331daae2065ea (patch) | |
| tree | 70c5df9fc0fdeae6b45f1bee1ef00be8a43feb3d | |
| parent | c4a53f904aa70ecea724e94f40ddd9d8a4a300bc (diff) | |
| download | nuttx-42f88ff4e84da6f73f65569a6ce331daae2065ea.tar.gz nuttx-42f88ff4e84da6f73f65569a6ce331daae2065ea.tar.bz2 nuttx-42f88ff4e84da6f73f65569a6ce331daae2065ea.zip | |
cosmetic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1444 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/net/netdev-ioctl.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/nuttx/net/netdev-ioctl.c b/nuttx/net/netdev-ioctl.c index 00ddd6e31..f54362ff3 100644 --- a/nuttx/net/netdev-ioctl.c +++ b/nuttx/net/netdev-ioctl.c @@ -82,7 +82,7 @@ static void ioctl_getipaddr(struct sockaddr *outaddr, uip_ipaddr_t *inaddr) { #ifdef CONFIG_NET_IPv6 -#error " big enough for IPv6 address" +#error "Not big enough for IPv6 address" struct sockaddr_in6 *dest = (struct sockaddr_in6 *)outaddr; dest->sin_family = AF_INET6; dest->sin_port = 0; @@ -106,7 +106,15 @@ static void ioctl_setipaddr(uip_ipaddr_t *outaddr, struct sockaddr *inaddr) #endif } -static void ioctl_ifup(FAR struct uip_driver_s *dev) +/**************************************************************************** + * Name: ioctl_ifup / ioctl_ifdown + * + * Description: + * Bring the interface up/down + * + ****************************************************************************/ + +static inline void ioctl_ifup(FAR struct uip_driver_s *dev) { if (dev->d_ifup) { @@ -114,7 +122,7 @@ static void ioctl_ifup(FAR struct uip_driver_s *dev) } } -static void ioctl_ifdown(FAR struct uip_driver_s *dev) +static inline void ioctl_ifdown(FAR struct uip_driver_s *dev) { if (dev->d_ifdown) { @@ -225,7 +233,7 @@ int netdev_ioctl(int sockfd, int cmd, struct ifreq *req) memcpy(req->ifr_hwaddr.sa_data, dev->d_mac.ether_addr_octet, IFHWADDRLEN); break; - case SIOCSIFHWADDR: /* Set hardware address */ + case SIOCSIFHWADDR: /* Set hardware address -- will not take effect until ifup */ req->ifr_hwaddr.sa_family = AF_INETX; memcpy(dev->d_mac.ether_addr_octet, req->ifr_hwaddr.sa_data, IFHWADDRLEN); break; @@ -253,7 +261,7 @@ int netdev_ioctl(int sockfd, int cmd, struct ifreq *req) return OK; errout: - *get_errno_ptr() = err; + errno = err; return ERROR; } |