diff options
author | Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 2006-03-21 01:21:40 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-21 01:21:40 -0500 |
commit | b191ba0d599928372be5a89f75486eb58efab48a (patch) | |
tree | a0ecc636d121126aba838d49700ad9cfbbf94733 | |
parent | 0ac81ae34ec8898e7eb1388fe21e3cee7b626a88 (diff) |
[CONNECTOR]: Use netlink_has_listeners() to avoind unnecessary allocations.
Return -ESRCH from cn_netlink_send() when there are not listeners,
just as it could be done by netlink_broadcast(). Propagate
netlink_broadcast() error back to the caller.
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | Documentation/connector/connector.txt | 5 | ||||
-rw-r--r-- | drivers/connector/connector.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/connector/connector.txt b/Documentation/connector/connector.txt index 57a314b14cf8..ad6e0ba7b38c 100644 --- a/Documentation/connector/connector.txt +++ b/Documentation/connector/connector.txt | |||
@@ -69,10 +69,11 @@ Unregisters new callback with connector core. | |||
69 | 69 | ||
70 | struct cb_id *id - unique connector's user identifier. | 70 | struct cb_id *id - unique connector's user identifier. |
71 | 71 | ||
72 | void cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask); | 72 | int cn_netlink_send(struct cn_msg *msg, u32 __groups, int gfp_mask); |
73 | 73 | ||
74 | Sends message to the specified groups. It can be safely called from | 74 | Sends message to the specified groups. It can be safely called from |
75 | any context, but may silently fail under strong memory pressure. | 75 | softirq context, but may silently fail under strong memory pressure. |
76 | If there are no listeners for given group -ESRCH can be returned. | ||
76 | 77 | ||
77 | struct cn_msg * - message header(with attached data). | 78 | struct cn_msg * - message header(with attached data). |
78 | u32 __group - destination group. | 79 | u32 __group - destination group. |
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index 505677fb3157..d7125f4d9113 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c | |||
@@ -97,6 +97,9 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask) | |||
97 | group = __group; | 97 | group = __group; |
98 | } | 98 | } |
99 | 99 | ||
100 | if (!netlink_has_listeners(dev->nls, group)) | ||
101 | return -ESRCH; | ||
102 | |||
100 | size = NLMSG_SPACE(sizeof(*msg) + msg->len); | 103 | size = NLMSG_SPACE(sizeof(*msg) + msg->len); |
101 | 104 | ||
102 | skb = alloc_skb(size, gfp_mask); | 105 | skb = alloc_skb(size, gfp_mask); |
@@ -111,9 +114,7 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask) | |||
111 | 114 | ||
112 | NETLINK_CB(skb).dst_group = group; | 115 | NETLINK_CB(skb).dst_group = group; |
113 | 116 | ||
114 | netlink_broadcast(dev->nls, skb, 0, group, gfp_mask); | 117 | return netlink_broadcast(dev->nls, skb, 0, group, gfp_mask); |
115 | |||
116 | return 0; | ||
117 | 118 | ||
118 | nlmsg_failure: | 119 | nlmsg_failure: |
119 | kfree_skb(skb); | 120 | kfree_skb(skb); |