A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-15 01:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Fix to avoid redefination error in AP code

Browse source 
Fix to avoid redefination error in AP code.

Change-Id: Ib57e7e2936aefe6abf0945b249ae1cd44e50aceb
CRs-Fixed: 1008087
This commit is contained in:
Nirav Shah 2016-06-08 15:01:04 +05:30 • committed by Gerrit - the friendly Code Review server
commit 4cc0ba809c
2 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

26
qdf/inc/qdf_nbuf.h
View file

@ -129,19 +129,19 @@ struct mon_rx_status {
};
/* DHCP Related Mask */
#define DHCP_OPTION53 (0x35)
#define DHCP_OPTION53_LENGTH (1)
#define DHCP_OPTION53_OFFSET (0x11A)
#define DHCP_OPTION53_LENGTH_OFFSET (0x11B)
#define DHCP_OPTION53_STATUS_OFFSET (0x11C)
#define DHCPDISCOVER (1)
#define DHCPOFFER (2)
#define DHCPREQUEST (3)
#define DHCPDECLINE (4)
#define DHCPACK (5)
#define DHCPNAK (6)
#define DHCPRELEASE (7)
#define DHCPINFORM (8)
#define QDF_DHCP_OPTION53 (0x35)
#define QDF_DHCP_OPTION53_LENGTH (1)
#define QDF_DHCP_OPTION53_OFFSET (0x11A)
#define QDF_DHCP_OPTION53_LENGTH_OFFSET (0x11B)
#define QDF_DHCP_OPTION53_STATUS_OFFSET (0x11C)
#define QDF_DHCP_DISCOVER (1)
#define QDF_DHCP_OFFER (2)
#define QDF_DHCP_REQUEST (3)
#define QDF_DHCP_DECLINE (4)
#define QDF_DHCP_ACK (5)
#define QDF_DHCP_NAK (6)
#define QDF_DHCP_RELEASE (7)
#define QDF_DHCP_INFORM (8)
#define QDF_NBUF_IPA_CHECK_MASK 0x80000000

24
qdf/linux/src/qdf_trace.c
View file

@ -1218,33 +1218,33 @@ bool qdf_log_dhcp_pkt(uint8_t session_id, struct sk_buff *skb,
if ((qdf_dp_get_proto_bitmap() & QDF_NBUF_PKT_TRAC_TYPE_DHCP) &&
qdf_nbuf_is_ipv4_dhcp_pkt(skb) == true) {
if ((skb->data[DHCP_OPTION53_OFFSET] == DHCP_OPTION53) &&
(skb->data[DHCP_OPTION53_LENGTH_OFFSET] ==
DHCP_OPTION53_LENGTH)) {
if ((skb->data[QDF_DHCP_OPTION53_OFFSET] == QDF_DHCP_OPTION53) &&
(skb->data[QDF_DHCP_OPTION53_LENGTH_OFFSET] ==
QDF_DHCP_OPTION53_LENGTH)) {
switch (skb->data[DHCP_OPTION53_STATUS_OFFSET]) {
case DHCPDISCOVER:
switch (skb->data[QDF_DHCP_OPTION53_STATUS_OFFSET]) {
case QDF_DHCP_DISCOVER:
subtype = QDF_PROTO_DHCP_DISCOVER;
break;
case DHCPREQUEST:
case QDF_DHCP_REQUEST:
subtype = QDF_PROTO_DHCP_REQUEST;
break;
case DHCPOFFER:
case QDF_DHCP_OFFER:
subtype = QDF_PROTO_DHCP_OFFER;
break;
case DHCPACK:
case QDF_DHCP_ACK:
subtype = QDF_PROTO_DHCP_ACK;
break;
case DHCPNAK:
case QDF_DHCP_NAK:
subtype = QDF_PROTO_DHCP_NACK;
break;
case DHCPRELEASE:
case QDF_DHCP_RELEASE:
subtype = QDF_PROTO_DHCP_RELEASE;
break;
case DHCPINFORM:
case QDF_DHCP_INFORM:
subtype = QDF_PROTO_DHCP_INFORM;
break;
case DHCPDECLINE:
case QDF_DHCP_DECLINE:
subtype = QDF_PROTO_DHCP_DECLINE;
break;
default: