mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dpdk_merge' of https://github.com/istokes/ovs into HEAD

Browse Source
This commit is contained in:
Ben Pfaff
2018-01-02 07:45:17 -08:00
parent 3f33aa4772 cc4891f39d
commit 34944e81f0
14 changed files with 290 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/netdev-linux.c
View File

@@ -1198,7 +1198,7 @@ netdev_linux_sock_batch_send(int sock, int ifindex,
struct dp_packet *packet;
DP_PACKET_BATCH_FOR_EACH (packet, batch) {
iov[i].iov_base = dp_packet_data(packet);
iov[i].iov_len = dp_packet_get_send_len(packet);
iov[i].iov_len = dp_packet_size(packet);
mmsg[i].msg_hdr = (struct msghdr) { .msg_name = &sll,
.msg_namelen = sizeof sll,
.msg_iov = &iov[i],
@@ -1235,7 +1235,7 @@ netdev_linux_tap_batch_send(struct netdev *netdev_,
struct netdev_linux *netdev = netdev_linux_cast(netdev_);
struct dp_packet *packet;
DP_PACKET_BATCH_FOR_EACH (packet, batch) {
size_t size = dp_packet_get_send_len(packet);
size_t size = dp_packet_size(packet);
ssize_t retval;
int error;
@@ -1270,7 +1270,7 @@ netdev_linux_tap_batch_send(struct netdev *netdev_,
* expected to do additional queuing of packets. */
static int
netdev_linux_send(struct netdev *netdev_, int qid OVS_UNUSED,
struct dp_packet_batch *batch, bool may_steal,
struct dp_packet_batch *batch,
bool concurrent_txq OVS_UNUSED)
{
int error = 0;
@@ -1306,7 +1306,7 @@ netdev_linux_send(struct netdev *netdev_, int qid OVS_UNUSED,
}
free_batch:
dp_packet_delete_batch(batch, may_steal);
dp_packet_delete_batch(batch, true);
return error;
}