diff options
author | Thomas Graf <tgraf@suug.ch> | 2007-03-23 02:30:55 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:27:33 -0400 |
commit | c702e8047fe74648f7852a9c1de781b0d5a98402 (patch) | |
tree | 24bd031d79f3d1159bc08704a51c84de01d712b0 /net/xfrm/xfrm_user.c | |
parent | ead592ba246dfcc643b3f0f0c8c03f7bc898a59f (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/xfrm/xfrm_user.c')
-rw-r--r-- | net/xfrm/xfrm_user.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 5e52d6275ba..2ff968373f1 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
@@ -1856,7 +1856,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
1856 | { | 1856 | { |
1857 | struct rtattr *xfrma[XFRMA_MAX]; | 1857 | struct rtattr *xfrma[XFRMA_MAX]; |
1858 | struct xfrm_link *link; | 1858 | struct xfrm_link *link; |
1859 | int type, min_len, err; | 1859 | int type, min_len; |
1860 | 1860 | ||
1861 | type = nlh->nlmsg_type; | 1861 | type = nlh->nlmsg_type; |
1862 | if (type > XFRM_MSG_MAX) | 1862 | if (type > XFRM_MSG_MAX) |
@@ -1875,10 +1875,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) | |||
1875 | if (link->dump == NULL) | 1875 | if (link->dump == NULL) |
1876 | return -EINVAL; | 1876 | return -EINVAL; |
1877 | 1877 | ||
1878 | err = netlink_dump_start(xfrm_nl, skb, nlh, link->dump, NULL); | 1878 | return netlink_dump_start(xfrm_nl, skb, nlh, link->dump, NULL); |
1879 | if (err == 0) | ||
1880 | err = -EINTR; | ||
1881 | return err; | ||
1882 | } | 1879 | } |
1883 | 1880 | ||
1884 | memset(xfrma, 0, sizeof(xfrma)); | 1881 | memset(xfrma, 0, sizeof(xfrma)); |