aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/icmp_socket.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-06-03 16:19:21 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-07-01 16:47:19 -0400
commitacd34afa89772f6379b642bb979d0a112328c769 (patch)
treedc72002fdefbd521253f651a53bbed762d3af899 /net/batman-adv/icmp_socket.c
parentd69909d2fc9e00bd8149cc8df9b18c35008e3e62 (diff)
batman-adv: Prefix packet enum with BATADV_
Reported-by: Martin Hundebøll <martin@hundeboll.net> Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/icmp_socket.c')
-rw-r--r--net/batman-adv/icmp_socket.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index f5373a2a4d0..a64cce2c480 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -187,14 +187,14 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff,
187 goto free_skb; 187 goto free_skb;
188 } 188 }
189 189
190 if (icmp_packet->header.packet_type != BAT_ICMP) { 190 if (icmp_packet->header.packet_type != BATADV_ICMP) {
191 batadv_dbg(DBG_BATMAN, bat_priv, 191 batadv_dbg(DBG_BATMAN, bat_priv,
192 "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n"); 192 "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n");
193 len = -EINVAL; 193 len = -EINVAL;
194 goto free_skb; 194 goto free_skb;
195 } 195 }
196 196
197 if (icmp_packet->msg_type != ECHO_REQUEST) { 197 if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) {
198 batadv_dbg(DBG_BATMAN, bat_priv, 198 batadv_dbg(DBG_BATMAN, bat_priv,
199 "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n"); 199 "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n");
200 len = -EINVAL; 200 len = -EINVAL;
@@ -204,7 +204,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff,
204 icmp_packet->uid = socket_client->index; 204 icmp_packet->uid = socket_client->index;
205 205
206 if (icmp_packet->header.version != BATADV_COMPAT_VERSION) { 206 if (icmp_packet->header.version != BATADV_COMPAT_VERSION) {
207 icmp_packet->msg_type = PARAMETER_PROBLEM; 207 icmp_packet->msg_type = BATADV_PARAMETER_PROBLEM;
208 icmp_packet->header.version = BATADV_COMPAT_VERSION; 208 icmp_packet->header.version = BATADV_COMPAT_VERSION;
209 batadv_socket_add_packet(socket_client, icmp_packet, 209 batadv_socket_add_packet(socket_client, icmp_packet,
210 packet_len); 210 packet_len);
@@ -239,7 +239,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff,
239 goto out; 239 goto out;
240 240
241dst_unreach: 241dst_unreach:
242 icmp_packet->msg_type = DESTINATION_UNREACHABLE; 242 icmp_packet->msg_type = BATADV_DESTINATION_UNREACHABLE;
243 batadv_socket_add_packet(socket_client, icmp_packet, packet_len); 243 batadv_socket_add_packet(socket_client, icmp_packet, packet_len);
244free_skb: 244free_skb:
245 kfree_skb(skb); 245 kfree_skb(skb);