Skip to content
Snippets Groups Projects
Commit 0b85959e authored by Cenk Gündoğan's avatar Cenk Gündoğan
Browse files

Revert "netdev2_tap: return actual byte number on read request"

This reverts commit 613bceea.

FIONREAD seems to be unsupported for tun/tap interfaces in Linux.
parent 7b272c5f
No related branches found
No related tags found
No related merge requests found
...@@ -55,6 +55,11 @@ extern "C" { ...@@ -55,6 +55,11 @@ extern "C" {
*/ */
#define NATIVE_ETH_PROTO 0x1234 #define NATIVE_ETH_PROTO 0x1234
#if (defined(GNRC_PKTBUF_SIZE)) && (GNRC_PKTBUF_SIZE < 2048)
# undef GNRC_PKTBUF_SIZE
# define GNRC_PKTBUF_SIZE (2048)
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
...@@ -215,8 +215,6 @@ static int _recv(netdev2_t *netdev2, void *buf, size_t len, void *info) ...@@ -215,8 +215,6 @@ static int _recv(netdev2_t *netdev2, void *buf, size_t len, void *info)
(void)info; (void)info;
if (!buf) { if (!buf) {
int waiting_bytes;
if (len > 0) { if (len > 0) {
/* no memory available in pktbuf, discarding the frame */ /* no memory available in pktbuf, discarding the frame */
DEBUG("netdev2_tap: discarding the frame\n"); DEBUG("netdev2_tap: discarding the frame\n");
...@@ -236,9 +234,9 @@ static int _recv(netdev2_t *netdev2, void *buf, size_t len, void *info) ...@@ -236,9 +234,9 @@ static int _recv(netdev2_t *netdev2, void *buf, size_t len, void *info)
_continue_reading(dev); _continue_reading(dev);
} }
/* get number of waiting bytes at dev->tap_fd */ /* no way of figuring out packet size without racey buffering,
real_ioctl(dev->tap_fd, FIONREAD, &waiting_bytes); * so we return the maximum possible size */
return waiting_bytes; return ETHERNET_FRAME_LEN;
} }
int nread = real_read(dev->tap_fd, buf, len); int nread = real_read(dev->tap_fd, buf, len);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment