aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/gateway_client.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/gateway_client.c')
-rw-r--r--net/batman-adv/gateway_client.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
index f43eb57b8a69..3916e90ff6ed 100644
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@ -33,8 +33,8 @@
33/* This is the offset of the options field in a dhcp packet starting at 33/* This is the offset of the options field in a dhcp packet starting at
34 * the beginning of the dhcp header 34 * the beginning of the dhcp header
35 */ 35 */
36#define DHCP_OPTIONS_OFFSET 240 36#define BATADV_DHCP_OPTIONS_OFFSET 240
37#define DHCP_REQUEST 3 37#define BATADV_DHCP_REQUEST 3
38 38
39static void batadv_gw_node_free_ref(struct gw_node *gw_node) 39static void batadv_gw_node_free_ref(struct gw_node *gw_node)
40{ 40{
@@ -521,11 +521,11 @@ static bool batadv_is_type_dhcprequest(struct sk_buff *skb, int header_len)
521 521
522 pkt_len = skb_headlen(skb); 522 pkt_len = skb_headlen(skb);
523 523
524 if (pkt_len < header_len + DHCP_OPTIONS_OFFSET + 1) 524 if (pkt_len < header_len + BATADV_DHCP_OPTIONS_OFFSET + 1)
525 goto out; 525 goto out;
526 526
527 p = skb->data + header_len + DHCP_OPTIONS_OFFSET; 527 p = skb->data + header_len + BATADV_DHCP_OPTIONS_OFFSET;
528 pkt_len -= header_len + DHCP_OPTIONS_OFFSET + 1; 528 pkt_len -= header_len + BATADV_DHCP_OPTIONS_OFFSET + 1;
529 529
530 /* Access the dhcp option lists. Each entry is made up by: 530 /* Access the dhcp option lists. Each entry is made up by:
531 * - octet 1: option type 531 * - octet 1: option type
@@ -543,7 +543,7 @@ static bool batadv_is_type_dhcprequest(struct sk_buff *skb, int header_len)
543 p += 2; 543 p += 2;
544 544
545 /* check if the message type is what we need */ 545 /* check if the message type is what we need */
546 if (*p == DHCP_REQUEST) 546 if (*p == BATADV_DHCP_REQUEST)
547 ret = true; 547 ret = true;
548 break; 548 break;
549 } else if (*p == 0) { 549 } else if (*p == 0) {