lkml.org 
[lkml]   [2013]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv4 09/16] staging: usbip: Separate protocol/program version
    Date
    Not all new program versions necessarily introduce
    non-backwards-compatible protocol changes. We thus move the definition
    of the protocol version from configure.ac to usbip_network.h, where it
    logically belongs to.

    Signed-off-by: Dominik Paulus <dominik.paulus@fau.de>
    Signed-off-by: Tobias Polzer <tobias.polzer@fau.de>
    ---
    drivers/staging/usbip/userspace/configure.ac | 1 -
    drivers/staging/usbip/userspace/src/usbip_network.c | 6 +++---
    drivers/staging/usbip/userspace/src/usbip_network.h | 6 ++++++
    3 files changed, 9 insertions(+), 4 deletions(-)

    diff --git a/drivers/staging/usbip/userspace/configure.ac b/drivers/staging/usbip/userspace/configure.ac
    index 2208516..bc08b81 100644
    --- a/drivers/staging/usbip/userspace/configure.ac
    +++ b/drivers/staging/usbip/userspace/configure.ac
    @@ -2,7 +2,6 @@ dnl Process this file with autoconf to produce a configure script.

    AC_PREREQ(2.59)
    AC_INIT([usbip-utils], [1.1.1], [linux-usb@vger.kernel.org])
    -AC_DEFINE([USBIP_VERSION], [0x00000111], [binary-coded decimal version number])

    CURRENT=0
    REVISION=1
    diff --git a/drivers/staging/usbip/userspace/src/usbip_network.c b/drivers/staging/usbip/userspace/src/usbip_network.c
    index e573cb2..a606e2b 100644
    --- a/drivers/staging/usbip/userspace/src/usbip_network.c
    +++ b/drivers/staging/usbip/userspace/src/usbip_network.c
    @@ -156,7 +156,7 @@ int usbip_net_send_op_common(int sockfd, uint32_t code, uint32_t status)

    memset(&op_common, 0, sizeof(op_common));

    - op_common.version = USBIP_VERSION;
    + op_common.version = PROTOCOL_VERSION;
    op_common.code = code;
    op_common.status = status;

    @@ -186,9 +186,9 @@ int usbip_net_recv_op_common(int sockfd, uint16_t *code)

    PACK_OP_COMMON(0, &op_common);

    - if (op_common.version != USBIP_VERSION) {
    + if (op_common.version != PROTOCOL_VERSION) {
    dbg("version mismatch: %d %d", op_common.version,
    - USBIP_VERSION);
    + PROTOCOL_VERSION);
    return -ERR_MISMATCH;
    }

    diff --git a/drivers/staging/usbip/userspace/src/usbip_network.h b/drivers/staging/usbip/userspace/src/usbip_network.h
    index d3c1b71..6a41fd8 100644
    --- a/drivers/staging/usbip/userspace/src/usbip_network.h
    +++ b/drivers/staging/usbip/userspace/src/usbip_network.h
    @@ -14,6 +14,12 @@

    #include <stdint.h>

    +/*
    + * Protocol version. Incremented only on non-backwards-compatible
    + * changes.
    + */
    +#define PROTOCOL_VERSION 0x111
    +
    extern int usbip_port;
    extern char *usbip_port_string;
    extern char *usbip_srp_password;
    --
    1.8.4.1


    \
     
     \ /
      Last update: 2013-10-19 17:41    [W:4.407 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site