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

[~andy/linux] / net / rxrpc / ar-ack.c

diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
index b6ffe4e1b84afa8a12205bf0bc00ff424341c2c0..f99cfce7ca9706665520ba86cf4b7feb75c726c7 100644 (file)
--- a/net/rxrpc/ar-ack.c
+++ b/net/rxrpc/ar-ack.c
@@ -375,7 +375,6 @@ protocol_error:
  */
 static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
 {
-       struct rxrpc_skb_priv *sp;
        unsigned long _skb;
        int tail = call->acks_tail, old_tail;
        int win = CIRC_CNT(call->acks_head, tail, call->acks_winsz);
@@ -387,7 +386,6 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
        while (call->acks_hard < hard) {
                smp_read_barrier_depends();
                _skb = call->acks_window[tail] & ~1;
-               sp = rxrpc_skb((struct sk_buff *) _skb);
                rxrpc_free_skb((struct sk_buff *) _skb);
                old_tail = tail;
                tail = (tail + 1) & (call->acks_winsz - 1);