FTP: remove reserved uint32 from header.

src/uas/QGCUASFileManager.cc

@@ -44,7 +44,7 @@ QGCUASFileManager::QGCUASFileManager(QObject* parent, UASInterface* uas, uint8_t
     _systemIdServer = _mav->getUASID();
     
     // Make sure we don't have bad structure packing
-    Q_ASSERT(sizeof(RequestHeader) == 16);
+    Q_ASSERT(sizeof(RequestHeader) == 12);
 }
 
 /// @brief Respond to the Ack associated with the Open command with the next Read command.
@@ -475,9 +475,8 @@ void QGCUASFileManager::_sendRequest(Request* request)
     _lastOutgoingSeqNumber++;
 
     request->hdr.seqNumber = _lastOutgoingSeqNumber;
-    request->hdr.reserved[0] = 0;
-    request->hdr.reserved[1] = 0;
-    request->hdr.reserved[2] = 0;
+    request->hdr.padding[0] = 0;
+    request->hdr.padding[1] = 0;
     
     if (_systemIdQGC == 0) {
         _systemIdQGC = MainWindow::instance()->getMAVLink()->getSystemId();

src/uas/QGCUASFileManager.h

@@ -84,7 +84,7 @@ protected:
             uint8_t     opcode;     ///< Command opcode
             uint8_t     size;       ///< Size of data
             uint8_t     req_opcode; ///< Request opcode returned in kRspAck, kRspNak message
-            uint16_t    reserved[3];
+            uint8_t     padding[2]; ///< 32 bit aligment padding
             uint32_t    offset;     ///< Offsets for List and Read commands
         };