Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe

diff --cc src/net/udp/tftp.c
index d5f02a0,4d44190..e969800
--- 1/src/net/udp/tftp.c
--- 2/src/net/udp/tftp.c
+++ b/src/net/udp/tftp.c
@@@ -907,9 -764,8 +910,8 @@@ static int tftp_socket_deliver_iob ( st
  
  /** TFTP socket operations */
  static struct xfer_interface_operations tftp_socket_operations = {
 -      .close          = tftp_socket_close,
 +      .close          = ignore_xfer_close,
        .vredirect      = xfer_vopen,
-       .seek           = ignore_xfer_seek,
        .window         = unlimited_xfer_window,
        .alloc_iob      = default_xfer_alloc_iob,
        .deliver_iob    = tftp_socket_deliver_iob,
@@@ -933,11 -789,30 +935,10 @@@ static int tftp_mc_socket_deliver_iob 
        return tftp_rx ( tftp, iobuf, meta );
  }
  
 -/**
 - * TFTP multicast connection closed by network stack
 - *
 - * @v socket          Multicast transport layer interface
 - * @v rc              Reason for close
 - */
 -static void tftp_mc_socket_close ( struct xfer_interface *mc_socket,
 -                                 int rc ) {
 -      struct tftp_request *tftp =
 -              container_of ( mc_socket, struct tftp_request, mc_socket );
 -
 -      DBGC ( tftp, "TFTP %p multicast socket closed: %s\n",
 -             tftp, strerror ( rc ) );
 -
 -      /* The multicast socket may be closed when we receive a new
 -       * OACK and open/reopen the socket; we should not call
 -       * tftp_done() at this point.
 -       */
 -}
 - 
  /** TFTP multicast socket operations */
  static struct xfer_interface_operations tftp_mc_socket_operations = {
 -      .close          = tftp_mc_socket_close,
 +      .close          = ignore_xfer_close,
        .vredirect      = xfer_vopen,
-       .seek           = ignore_xfer_seek,
        .window         = unlimited_xfer_window,
        .alloc_iob      = default_xfer_alloc_iob,
        .deliver_iob    = tftp_mc_socket_deliver_iob,