Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / rxrpc / output.c

diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c
index 5dab1ff3a6c2d89d7e6c3b6ee53e6c8a97bc785d..5bd2d0fa4a039235d179cb41bf7ee25aef13b594 100644 (file)
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@ -292,6 +292,10 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb,
        whdr._rsvd      = htons(sp->hdr._rsvd);
        whdr.serviceId  = htons(call->service_id);
 
+       if (test_bit(RXRPC_CONN_PROBING_FOR_UPGRADE, &conn->flags) &&
+           sp->hdr.seq == 1)
+               whdr.userStatus = RXRPC_USERSTATUS_SERVICE_UPGRADE;
+
        iov[0].iov_base = &whdr;
        iov[0].iov_len = sizeof(whdr);
        iov[1].iov_base = skb->head;