chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
61c8175
)
sd-pppoe: whitespace
author
Tom Gundersen
<teg@jklm.no>
Tue, 4 Nov 2014 15:21:41 +0000
(16:21 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Wed, 5 Nov 2014 15:54:22 +0000
(16:54 +0100)
src/libsystemd-network/sd-pppoe.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-network/sd-pppoe.c
b/src/libsystemd-network/sd-pppoe.c
index 21ddaebdd2943388e80186da88feaa6d12021d0b..075e10204bacd50a57092d3177d8795d48e8faa9 100644
(file)
--- a/
src/libsystemd-network/sd-pppoe.c
+++ b/
src/libsystemd-network/sd-pppoe.c
@@
-698,8
+698,7
@@
static int pppoe_handle_message(sd_pppoe *ppp, struct pppoe_hdr *packet, struct
return 0;
}
return 0;
}
-static int pppoe_receive_message(sd_event_source *s, int fd,
- uint32_t revents, void *userdata) {
+static int pppoe_receive_message(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
sd_pppoe *ppp = userdata;
_cleanup_free_ struct pppoe_hdr *packet = NULL;
union sockaddr_union link = {};
sd_pppoe *ppp = userdata;
_cleanup_free_ struct pppoe_hdr *packet = NULL;
union sockaddr_union link = {};
@@
-721,11
+720,9
@@
static int pppoe_receive_message(sd_event_source *s, int fd,
if (!packet)
return -ENOMEM;
if (!packet)
return -ENOMEM;
- len = recvfrom(fd, packet, buflen, 0,
- &link.sa, &addrlen);
+ len = recvfrom(fd, packet, buflen, 0, &link.sa, &addrlen);
if (len < 0) {
if (len < 0) {
- log_warning("PPPoE: colud not receive message from raw socket: %s",
- strerror(-r));
+ log_warning("PPPoE: colud not receive message from raw socket: %s", strerror(-r));
return 0;
} else if ((size_t)len < sizeof(struct pppoe_hdr))
return 0;
return 0;
} else if ((size_t)len < sizeof(struct pppoe_hdr))
return 0;