Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[tinc] / src / solaris / device.c

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 969b514..365561f 100644 (file)
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -127,9 +127,9 @@ static void close_device(void) {
 }
 
 static 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;
@@ -151,7 +151,7 @@ static bool read_packet(vpn_packet_t *packet) {
                        return false;
        }
 
-       packet->len = lenin + 14;
+       packet->len = inlen + 14;
 
        device_total_in += packet->len;