These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / roms / ipxe / src / include / ipxe / tcpip.h

diff --git a/qemu/roms/ipxe/src/include/ipxe/tcpip.h b/qemu/roms/ipxe/src/include/ipxe/tcpip.h
index 200630d..3cfc8e3 100644 (file)
--- a/qemu/roms/ipxe/src/include/ipxe/tcpip.h
+++ b/qemu/roms/ipxe/src/include/ipxe/tcpip.h
@@ -7,7 +7,7 @@
  *
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <ipxe/socket.h>
@@ -48,6 +48,12 @@ struct sockaddr_tcpip {
        uint16_t st_flags;
        /** TCP/IP port */
        uint16_t st_port;
+       /** Scope ID
+        *
+        * For link-local or multicast addresses, this is the network
+        * device index.
+        */
+        uint16_t st_scope_id;
        /** Padding
         *
         * This ensures that a struct @c sockaddr_tcpip is large
@@ -57,7 +63,8 @@ struct sockaddr_tcpip {
        char pad[ sizeof ( struct sockaddr ) -
                  ( sizeof ( sa_family_t ) /* st_family */ +
                    sizeof ( uint16_t ) /* st_flags */ +
-                   sizeof ( uint16_t ) /* st_port */ ) ];
+                   sizeof ( uint16_t ) /* st_port */ +
+                   sizeof ( uint16_t ) /* st_scope_id */ ) ];
 } __attribute__ (( packed, may_alias ));
 
 /**