vhad/RIOT
1
0
Fork 0
mirror of https://github.com/gosticks/RIOT.git synced 2025-10-16 12:05:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cpu/native/netdev_tap: adapt to netdev with iolist

Browse Source
This commit is contained in:
Kaspar Schleiser 2018-01-11 23:48:57 +01:00
parent 51dabf93ad
commit ff6b8aa4f1
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.dep
View File

@ -110,6 +110,7 @@ endif
ifneq (,$(filter netdev_tap,$(USEMODULE))) ifneq (,$(filter netdev_tap,$(USEMODULE)))
USEMODULE += netif USEMODULE += netif
USEMODULE += netdev_eth USEMODULE += netdev_eth
USEMODULE += iolist
endif endif
ifneq (,$(filter gnrc_tftp,$(USEMODULE))) ifneq (,$(filter gnrc_tftp,$(USEMODULE)))

21
cpu/native/netdev_tap/netdev_tap.c
View File

@ -26,6 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/uio.h>
#include <unistd.h> #include <unistd.h>
/* needs to be included before native's declarations of ntohl etc. */ /* needs to be included before native's declarations of ntohl etc. */
@ -51,6 +52,7 @@
#include "async_read.h" #include "async_read.h"
#include "iolist.h"
#include "net/eui64.h" #include "net/eui64.h"
#include "net/netdev.h" #include "net/netdev.h"
#include "net/netdev/eth.h" #include "net/netdev/eth.h"
@ -64,7 +66,7 @@
/* netdev interface */ /* netdev interface */
static int _init(netdev_t *netdev); static int _init(netdev_t *netdev);
static int _send(netdev_t *netdev, const struct iovec *vector, unsigned n); static int _send(netdev_t *netdev, const iolist_t *iolist);
static int _recv(netdev_t *netdev, void *buf, size_t n, void *info); static int _recv(netdev_t *netdev, void *buf, size_t n, void *info);
static inline void _get_mac_addr(netdev_t *netdev, uint8_t *dst) static inline void _get_mac_addr(netdev_t *netdev, uint8_t *dst)
@ -273,17 +275,20 @@ static int _recv(netdev_t *netdev, void *buf, size_t len, void *info)
return -1; return -1;
} }
static int _send(netdev_t *netdev, const struct iovec *vector, unsigned n) static int _send(netdev_t *netdev, const iolist_t *iolist)
{ {
netdev_tap_t *dev = (netdev_tap_t*)netdev; netdev_tap_t *dev = (netdev_tap_t*)netdev;
int res = _native_writev(dev->tap_fd, vector, n);
struct iovec iov[iolist_count(iolist)];
unsigned n;
size_t bytes = iolist_to_iovec(iolist, iov, &n);
int res = _native_writev(dev->tap_fd, iov, n);
#ifdef MODULE_NETSTATS_L2 #ifdef MODULE_NETSTATS_L2
size_t bytes = 0;
for (unsigned i = 0; i < n; i++) {
bytes += vector->iov_len;
vector++;
}
netdev->stats.tx_bytes += bytes; netdev->stats.tx_bytes += bytes;
#else
(void)bytes;
#endif #endif
if (netdev->event_callback) { if (netdev->event_callback) {
netdev->event_callback(netdev, NETDEV_EVENT_TX_COMPLETE); netdev->event_callback(netdev, NETDEV_EVENT_TX_COMPLETE);