rxrpc: Fix the names of the fields in the ACK trailer struct

[linux-2.6-microblaze.git] / net / rxrpc / input.c

diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index c435b50..ea2df62 100644 (file)
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -670,14 +670,14 @@ static void rxrpc_complete_rtt_probe(struct rxrpc_call *call,
 /*
  * Process the extra information that may be appended to an ACK packet
  */
-static void rxrpc_input_ackinfo(struct rxrpc_call *call, struct sk_buff *skb,
-                               struct rxrpc_ackinfo *ackinfo)
+static void rxrpc_input_ack_trailer(struct rxrpc_call *call, struct sk_buff *skb,
+                                   struct rxrpc_acktrailer *trailer)
 {
        struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
        struct rxrpc_peer *peer;
        unsigned int mtu;
        bool wake = false;
-       u32 rwind = ntohl(ackinfo->rwind);
+       u32 rwind = ntohl(trailer->rwind);
 
        if (rwind > RXRPC_TX_MAX_WINDOW)
                rwind = RXRPC_TX_MAX_WINDOW;
@@ -691,7 +691,7 @@ static void rxrpc_input_ackinfo(struct rxrpc_call *call, struct sk_buff *skb,
        if (call->cong_ssthresh > rwind)
                call->cong_ssthresh = rwind;
 
-       mtu = min(ntohl(ackinfo->rxMTU), ntohl(ackinfo->maxMTU));
+       mtu = min(ntohl(trailer->maxMTU), ntohl(trailer->ifMTU));
 
        peer = call->peer;
        if (mtu < peer->maxdata) {
@@ -837,7 +837,7 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb)
        struct rxrpc_ack_summary summary = { 0 };
        struct rxrpc_ackpacket ack;
        struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-       struct rxrpc_ackinfo info;
+       struct rxrpc_acktrailer trailer;
        rxrpc_serial_t ack_serial, acked_serial;
        rxrpc_seq_t first_soft_ack, hard_ack, prev_pkt, since;
        int nr_acks, offset, ioffset;
@@ -917,11 +917,11 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb)
                goto send_response;
        }
 
-       info.rxMTU = 0;
+       trailer.maxMTU = 0;
        ioffset = offset + nr_acks + 3;
-       if (skb->len >= ioffset + sizeof(info) &&
-           skb_copy_bits(skb, ioffset, &info, sizeof(info)) < 0)
-               return rxrpc_proto_abort(call, 0, rxrpc_badmsg_short_ack_info);
+       if (skb->len >= ioffset + sizeof(trailer) &&
+           skb_copy_bits(skb, ioffset, &trailer, sizeof(trailer)) < 0)
+               return rxrpc_proto_abort(call, 0, rxrpc_badmsg_short_ack_trailer);
 
        if (nr_acks > 0)
                skb_condense(skb);
@@ -950,8 +950,8 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb)
        }
 
        /* Parse rwind and mtu sizes if provided. */
-       if (info.rxMTU)
-               rxrpc_input_ackinfo(call, skb, &info);
+       if (trailer.maxMTU)
+               rxrpc_input_ack_trailer(call, skb, &trailer);
 
        if (first_soft_ack == 0)
                return rxrpc_proto_abort(call, 0, rxrpc_eproto_ackr_zero);