diff options
Diffstat (limited to '')
| -rw-r--r-- | include/net/net.h | 5 | ||||
| -rw-r--r-- | net/slirp.c | 2 | ||||
| -rw-r--r-- | net/tap-win32.c | 2 | ||||
| -rw-r--r-- | net/tap.c | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/include/net/net.h b/include/net/net.h index eff24519d2..1ef536d771 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -241,4 +241,9 @@ uint32_t net_crc32_le(const uint8_t *p, int len); .offset = vmstate_offset_macaddr(_state, _field), \ } +static inline bool net_peer_needs_padding(NetClientState *nc) +{ + return nc->peer && !nc->peer->do_not_pad; +} + #endif diff --git a/net/slirp.c b/net/slirp.c index a01a0fccd3..7a4e96db5c 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -119,7 +119,7 @@ static ssize_t net_slirp_send_packet(const void *pkt, size_t pkt_len, uint8_t min_pkt[ETH_ZLEN]; size_t min_pktsz = sizeof(min_pkt); - if (!s->nc.peer->do_not_pad) { + if (net_peer_needs_padding(&s->nc)) { if (eth_pad_short_frame(min_pkt, &min_pktsz, pkt, pkt_len)) { pkt = min_pkt; pkt_len = min_pktsz; diff --git a/net/tap-win32.c b/net/tap-win32.c index 897bd18e32..6096972f5d 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -696,7 +696,7 @@ static void tap_win32_send(void *opaque) if (size > 0) { orig_buf = buf; - if (!s->nc.peer->do_not_pad) { + if (net_peer_needs_padding(&s->nc)) { if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) { buf = min_pkt; size = min_pktsz; diff --git a/net/tap.c b/net/tap.c index dd42ac6134..bae895e287 100644 --- a/net/tap.c +++ b/net/tap.c @@ -203,7 +203,7 @@ static void tap_send(void *opaque) size -= s->host_vnet_hdr_len; } - if (!s->nc.peer->do_not_pad) { + if (net_peer_needs_padding(&s->nc)) { if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) { buf = min_pkt; size = min_pktsz; |