Patchwork tap: make set_offload a nop after netdev cleanup

login
register
mail settings
Submitter Michael S. Tsirkin
Date Oct. 31, 2010, 5:06 p.m.
Message ID <20101031170647.GA426@redhat.com>
Download mbox | patch
Permalink /patch/69723/
State New
Headers show

Comments

Michael S. Tsirkin - Oct. 31, 2010, 5:06 p.m.
virtio-net expects set_offload to succeed after
peer cleanup.
Since we don't have an open fd anymore, make it so.
Fixes warning about the failure of offload setting.

Reported-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 net/tap.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Patch

diff --git a/net/tap.c b/net/tap.c
index 4cfa538..51c762d 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -248,6 +248,9 @@  void tap_set_offload(VLANClientState *nc, int csum, int tso4,
                      int tso6, int ecn, int ufo)
 {
     TAPState *s = DO_UPCAST(TAPState, nc, nc);
+    if (s->fd < 0) {
+        return 0;
+    }
 
     return tap_fd_set_offload(s->fd, csum, tso4, tso6, ecn, ufo);
 }
@@ -269,6 +272,7 @@  static void tap_cleanup(VLANClientState *nc)
     tap_read_poll(s, 0);
     tap_write_poll(s, 0);
     close(s->fd);
+    s->fd = -1;
 }
 
 static void tap_poll(VLANClientState *nc, bool enable)