net: ipv4: Standardize prefixes for message logging

[cascardo/linux.git] / net / ipv4 / udp.c

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 5d075b5..d6f5fee 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -77,6 +77,8 @@
  *             2 of the License, or (at your option) any later version.
  */
 
+#define pr_fmt(fmt) "UDP: " fmt
+
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
@@ -917,7 +919,8 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                if (!saddr)
                        saddr = inet->mc_addr;
                connected = 0;
-       }
+       } else if (!ipc.oif)
+               ipc.oif = inet->uc_index;
 
        if (connected)
                rt = (struct rtable *)sk_dst_check(sk, 0);
@@ -974,7 +977,7 @@ back_from_confirm:
                /* ... which is an evident application bug. --ANK */
                release_sock(sk);
 
-               LIMIT_NETDEBUG(KERN_DEBUG "udp cork app bug 2\n");
+               LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("cork app bug 2\n"));
                err = -EINVAL;
                goto out;
        }
@@ -1053,7 +1056,7 @@ int udp_sendpage(struct sock *sk, struct page *page, int offset,
        if (unlikely(!up->pending)) {
                release_sock(sk);
 
-               LIMIT_NETDEBUG(KERN_DEBUG "udp cork app bug 3\n");
+               LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("udp cork app bug 3\n"));
                return -EINVAL;
        }
 
@@ -1166,7 +1169,7 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
        struct sockaddr_in *sin = (struct sockaddr_in *)msg->msg_name;
        struct sk_buff *skb;
        unsigned int ulen, copied;
-       int peeked;
+       int peeked, off = 0;
        int err;
        int is_udplite = IS_UDPLITE(sk);
        bool slow;
@@ -1182,7 +1185,7 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
 try_again:
        skb = __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0),
-                                 &peeked, &err);
+                                 &peeked, &off, &err);
        if (!skb)
                goto out;
 
@@ -1446,9 +1449,8 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
                 * provided by the application."
                 */
                if (up->pcrlen == 0) {          /* full coverage was set  */
-                       LIMIT_NETDEBUG(KERN_WARNING "UDPLITE: partial coverage "
-                               "%d while full coverage %d requested\n",
-                               UDP_SKB_CB(skb)->cscov, skb->len);
+                       LIMIT_NETDEBUG(KERN_WARNING "UDPLite: partial coverage %d while full coverage %d requested\n",
+                                      UDP_SKB_CB(skb)->cscov, skb->len);
                        goto drop;
                }
                /* The next case involves violating the min. coverage requested
@@ -1458,9 +1460,8 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
                 * Therefore the above ...()->partial_cov statement is essential.
                 */
                if (UDP_SKB_CB(skb)->cscov  <  up->pcrlen) {
-                       LIMIT_NETDEBUG(KERN_WARNING
-                               "UDPLITE: coverage %d too small, need min %d\n",
-                               UDP_SKB_CB(skb)->cscov, up->pcrlen);
+                       LIMIT_NETDEBUG(KERN_WARNING "UDPLite: coverage %d too small, need min %d\n",
+                                      UDP_SKB_CB(skb)->cscov, up->pcrlen);
                        goto drop;
                }
        }
@@ -1688,13 +1689,10 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
 
 short_packet:
        LIMIT_NETDEBUG(KERN_DEBUG "UDP%s: short packet: From %pI4:%u %d/%d to %pI4:%u\n",
-                      proto == IPPROTO_UDPLITE ? "-Lite" : "",
-                      &saddr,
-                      ntohs(uh->source),
-                      ulen,
-                      skb->len,
-                      &daddr,
-                      ntohs(uh->dest));
+                      proto == IPPROTO_UDPLITE ? "Lite" : "",
+                      &saddr, ntohs(uh->source),
+                      ulen, skb->len,
+                      &daddr, ntohs(uh->dest));
        goto drop;
 
 csum_error:
@@ -1703,11 +1701,8 @@ csum_error:
         * the network is concerned, anyway) as per 4.1.3.4 (MUST).
         */
        LIMIT_NETDEBUG(KERN_DEBUG "UDP%s: bad checksum. From %pI4:%u to %pI4:%u ulen %d\n",
-                      proto == IPPROTO_UDPLITE ? "-Lite" : "",
-                      &saddr,
-                      ntohs(uh->source),
-                      &daddr,
-                      ntohs(uh->dest),
+                      proto == IPPROTO_UDPLITE ? "Lite" : "",
+                      &saddr, ntohs(uh->source), &daddr, ntohs(uh->dest),
                       ulen);
 drop:
        UDP_INC_STATS_BH(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE);