diff options
Diffstat (limited to 'net/batman-adv/icmp_socket.c')
-rw-r--r-- | net/batman-adv/icmp_socket.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index 9b755f9eb182..b87518edcef9 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c | |||
@@ -59,8 +59,7 @@ static int bat_socket_open(struct inode *inode, struct file *file) | |||
59 | } | 59 | } |
60 | 60 | ||
61 | if (i == ARRAY_SIZE(socket_client_hash)) { | 61 | if (i == ARRAY_SIZE(socket_client_hash)) { |
62 | pr_err("Error - can't add another packet client: " | 62 | pr_err("Error - can't add another packet client: maximum number of clients reached\n"); |
63 | "maximum number of clients reached\n"); | ||
64 | kfree(socket_client); | 63 | kfree(socket_client); |
65 | return -EXFULL; | 64 | return -EXFULL; |
66 | } | 65 | } |
@@ -162,8 +161,7 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff, | |||
162 | 161 | ||
163 | if (len < sizeof(struct icmp_packet)) { | 162 | if (len < sizeof(struct icmp_packet)) { |
164 | bat_dbg(DBG_BATMAN, bat_priv, | 163 | bat_dbg(DBG_BATMAN, bat_priv, |
165 | "Error - can't send packet from char device: " | 164 | "Error - can't send packet from char device: invalid packet size\n"); |
166 | "invalid packet size\n"); | ||
167 | return -EINVAL; | 165 | return -EINVAL; |
168 | } | 166 | } |
169 | 167 | ||
@@ -193,16 +191,14 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff, | |||
193 | 191 | ||
194 | if (icmp_packet->header.packet_type != BAT_ICMP) { | 192 | if (icmp_packet->header.packet_type != BAT_ICMP) { |
195 | bat_dbg(DBG_BATMAN, bat_priv, | 193 | bat_dbg(DBG_BATMAN, bat_priv, |
196 | "Error - can't send packet from char device: " | 194 | "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n"); |
197 | "got bogus packet type (expected: BAT_ICMP)\n"); | ||
198 | len = -EINVAL; | 195 | len = -EINVAL; |
199 | goto free_skb; | 196 | goto free_skb; |
200 | } | 197 | } |
201 | 198 | ||
202 | if (icmp_packet->msg_type != ECHO_REQUEST) { | 199 | if (icmp_packet->msg_type != ECHO_REQUEST) { |
203 | bat_dbg(DBG_BATMAN, bat_priv, | 200 | bat_dbg(DBG_BATMAN, bat_priv, |
204 | "Error - can't send packet from char device: " | 201 | "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n"); |
205 | "got bogus message type (expected: ECHO_REQUEST)\n"); | ||
206 | len = -EINVAL; | 202 | len = -EINVAL; |
207 | goto free_skb; | 203 | goto free_skb; |
208 | } | 204 | } |