Merge branch 'master' into 1.1

[oweals/tinc.git] / src / solaris / device.c

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 9018c31a0811011ee661aafb88b32846019e3a08..d257ffdde2be1e621fa85150e62fddadc681ae0e 100644 (file)
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -112,9 +112,9 @@ void close_device(void) {
 }
 
 bool read_packet(vpn_packet_t *packet) {
-       int lenin;
+       int inlen;
 
-       if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+       if((inlen = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
                logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
                           device, strerror(errno));
                return false;
@@ -136,7 +136,7 @@ bool read_packet(vpn_packet_t *packet) {
                        return false;
        }
 
-       packet->len = lenin + 14;
+       packet->len = inlen + 14;
 
        device_total_in += packet->len;