X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=net%2Frxrpc%2Far-error.c;h=d4d1ae26d29313fffb1230a1fdcbe09d740a7cd0;hb=f653398c86a1c104f0992bd788dd4bb065449be4;hp=2c27df1ffa178a77c0f84dca2eae3e014c6ed8d7;hpb=651350d10f93bed7003c9a66e24cf25e0f8eed3d;p=safe%2Fjmp%2Flinux-2.6

diff --git a/net/rxrpc/ar-error.c b/net/rxrpc/ar-error.c
index 2c27df1..d4d1ae2 100644
--- a/net/rxrpc/ar-error.c
+++ b/net/rxrpc/ar-error.c
@@ -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);
 		}