udp: Simplify __udp*_lib_mcast_deliver.

[karo-tx-linux.git] / net / ipv4 / udp.c

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 668af516f0941eb24dc72f8859d8021d08024a34..bbcc33737ef17cd473faa1d99713a0b367e3dfc3 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -594,26 +594,6 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
        return true;
 }
 
-static inline struct sock *udp_v4_mcast_next(struct net *net, struct sock *sk,
-                                            __be16 loc_port, __be32 loc_addr,
-                                            __be16 rmt_port, __be32 rmt_addr,
-                                            int dif)
-{
-       struct hlist_nulls_node *node;
-       unsigned short hnum = ntohs(loc_port);
-
-       sk_nulls_for_each_from(sk, node) {
-               if (__udp_is_mcast_sock(net, sk,
-                                       loc_port, loc_addr,
-                                       rmt_port, rmt_addr,
-                                       dif, hnum))
-                       goto found;
-       }
-       sk = NULL;
-found:
-       return sk;
-}
-
 /*
  * This routine is called by the ICMP module when it gets some
  * sort of error condition.  If err < 0 then the socket should
@@ -1667,23 +1647,23 @@ static int __udp4_lib_mcast_deliver(struct net *net, struct sk_buff *skb,
                                    struct udp_table *udptable)
 {
        struct sock *sk, *stack[256 / sizeof(struct sock *)];
-       struct udp_hslot *hslot = udp_hashslot(udptable, net, ntohs(uh->dest));
-       int dif;
+       struct hlist_nulls_node *node;
+       unsigned short hnum = ntohs(uh->dest);
+       struct udp_hslot *hslot = udp_hashslot(udptable, net, hnum);
+       int dif = skb->dev->ifindex;
        unsigned int i, count = 0;
 
        spin_lock(&hslot->lock);
-       sk = sk_nulls_head(&hslot->head);
-       dif = skb->dev->ifindex;
-       sk = udp_v4_mcast_next(net, sk, uh->dest, daddr, uh->source, saddr, dif);
-       while (sk) {
-               stack[count++] = sk;
-               sk = udp_v4_mcast_next(net, sk_nulls_next(sk), uh->dest,
-                                      daddr, uh->source, saddr, dif);
-               if (unlikely(count == ARRAY_SIZE(stack))) {
-                       if (!sk)
-                               break;
-                       flush_stack(stack, count, skb, ~0);
-                       count = 0;
+       sk_nulls_for_each(sk, node, &hslot->head) {
+               if (__udp_is_mcast_sock(net, sk,
+                                       uh->dest, daddr,
+                                       uh->source, saddr,
+                                       dif, hnum)) {
+                       if (unlikely(count == ARRAY_SIZE(stack))) {
+                               flush_stack(stack, count, skb, ~0);
+                               count = 0;
+                       }
+                       stack[count++] = sk;
                }
        }
        /*