X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-network%2Fsd-pppoe.c;h=e8e7d994df2a174df40ff70ba6ce85f04f92919f;hb=c066b4746b4d25e576c9dc976e35cf6915905802;hp=9fb6f5382c4b0b94716287cf43a16a3dda2fec6e;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git

diff --git a/src/libsystemd-network/sd-pppoe.c b/src/libsystemd-network/sd-pppoe.c
index 9fb6f5382..e8e7d994d 100644
--- a/src/libsystemd-network/sd-pppoe.c
+++ b/src/libsystemd-network/sd-pppoe.c
@@ -36,7 +36,6 @@
 #include "socket-util.h"
 #include "async.h"
 #include "refcnt.h"
-#include "unaligned.h"
 #include "utf8.h"
 
 #define PPPOE_MAX_PACKET_SIZE 1484
@@ -422,7 +421,7 @@ static int pppoe_timeout(sd_event_source *s, uint64_t usec, void *userdata) {
         case PPPOE_STATE_INITIALIZING:
                 r = pppoe_send_initiation(ppp);
                 if (r < 0)
-                        log_warning_errno(-r, "PPPoE: sending PADI failed: %m");
+                        log_warning_errno(r, "PPPoE: sending PADI failed: %m");
 
                 break;
         case PPPOE_STATE_REQUESTING:
@@ -431,14 +430,14 @@ static int pppoe_timeout(sd_event_source *s, uint64_t usec, void *userdata) {
 
                         r = pppoe_send_initiation(ppp);
                         if (r < 0)
-                                log_warning_errno(-r, "PPPoE: sending PADI failed: %m");
+                                log_warning_errno(r, "PPPoE: sending PADI failed: %m");
 
                         ppp->padr_resend_count = PPPOE_MAX_PADR_RESEND;
                         ppp->state = PPPOE_STATE_INITIALIZING;
                 } else {
                         r = pppoe_send_request(ppp);
                         if (r < 0)
-                                log_warning_errno(-r, "PPPoE: sending PADR failed: %m");
+                                log_warning_errno(r, "PPPoE: sending PADR failed: %m");
                 }
 
                 break;
@@ -716,7 +715,7 @@ static int pppoe_receive_message(sd_event_source *s, int fd, uint32_t revents, v
 
         len = recvfrom(fd, packet, buflen, 0, &link.sa, &addrlen);
         if (len < 0) {
-                log_warning_errno(-r, "PPPoE: could not receive message from raw socket: %m");
+                log_warning_errno(r, "PPPoE: could not receive message from raw socket: %m");
                 return 0;
         } else if ((size_t)len < sizeof(struct pppoe_hdr))
                 return 0;