aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/inet_diag.c
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2007-03-23 02:30:55 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:27:33 -0400
commitc702e8047fe74648f7852a9c1de781b0d5a98402 (patch)
tree24bd031d79f3d1159bc08704a51c84de01d712b0 /net/ipv4/inet_diag.c
parentead592ba246dfcc643b3f0f0c8c03f7bc898a59f (diff)
[NETLINK]: Directly return -EINTR from netlink_dump_start()
Now that all users of netlink_dump_start() use netlink_run_queue() to process the receive queue, it is possible to return -EINTR from netlink_dump_start() directly, therefore simplying the callers. Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_diag.c')
-rw-r--r--net/ipv4/inet_diag.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 7dd97c5969b3..0148f0e34ceb 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -818,8 +818,6 @@ static int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
818 return -ENOENT; 818 return -ENOENT;
819 819
820 if (nlh->nlmsg_flags & NLM_F_DUMP) { 820 if (nlh->nlmsg_flags & NLM_F_DUMP) {
821 int err;
822
823 if (nlmsg_attrlen(nlh, hdrlen)) { 821 if (nlmsg_attrlen(nlh, hdrlen)) {
824 struct nlattr *attr; 822 struct nlattr *attr;
825 823
@@ -831,11 +829,8 @@ static int inet_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
831 return -EINVAL; 829 return -EINVAL;
832 } 830 }
833 831
834 err = netlink_dump_start(idiagnl, skb, nlh, 832 return netlink_dump_start(idiagnl, skb, nlh,
835 inet_diag_dump, NULL); 833 inet_diag_dump, NULL);
836 if (err == 0)
837 err = -EINTR;
838 return err;
839 } 834 }
840 835
841 return inet_diag_get_exact(skb, nlh); 836 return inet_diag_get_exact(skb, nlh);