]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - net/rxrpc/ar-error.c
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
[linux-2.6-omap-h63xx.git] / net / rxrpc / ar-error.c
index 2c27df1ffa178a77c0f84dca2eae3e014c6ed8d7..d4d1ae26d29313fffb1230a1fdcbe09d740a7cd0 100644 (file)
@@ -49,8 +49,7 @@ void rxrpc_UDP_error_report(struct sock *sk)
        addr = *(__be32 *)(skb_network_header(skb) + serr->addr_offset);
        port = serr->port;
 
-       _net("Rx UDP Error from "NIPQUAD_FMT":%hu",
-            NIPQUAD(addr), ntohs(port));
+       _net("Rx UDP Error from %pI4:%hu", &addr, ntohs(port));
        _debug("Msg l:%d d:%d", skb->len, skb->data_len);
 
        peer = rxrpc_find_peer(local, addr, port);
@@ -100,8 +99,10 @@ void rxrpc_UDP_error_report(struct sock *sk)
                }
 
                if (mtu < peer->mtu) {
+                       spin_lock_bh(&peer->lock);
                        peer->mtu = mtu;
                        peer->maxdata = peer->mtu - peer->hdrsize;
+                       spin_unlock_bh(&peer->lock);
                        _net("Net MTU %u (maxdata %u)",
                             peer->mtu, peer->maxdata);
                }