]>
Commit | Line | Data |
---|---|---|
e46e556c JR |
1 | diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c |
2 | index 255453b..87e6840 100644 | |
3 | --- a/core/rtw_ioctl_set.c | |
4 | +++ b/core/rtw_ioctl_set.c | |
5 | @@ -31,7 +31,7 @@ extern void indicate_wx_scan_complete_event(_adapter *padapter); | |
6 | (addr[4] == 0xff) && (addr[5] == 0xff) ) ? _TRUE : _FALSE \ | |
7 | ) | |
8 | ||
9 | -u8 rtw_validate_bssid(u8 *bssid) | |
10 | +u8 rtw_validate_bssid(const u8 *bssid) | |
11 | { | |
12 | u8 ret = _TRUE; | |
13 | ||
14 | @@ -525,7 +525,7 @@ _func_exit_; | |
15 | ||
16 | } | |
17 | ||
18 | -u8 rtw_set_802_11_connect(_adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid) | |
19 | +u8 rtw_set_802_11_connect(_adapter* padapter, const u8 *bssid, NDIS_802_11_SSID *ssid) | |
20 | { | |
21 | _irqL irqL; | |
22 | u8 status = _SUCCESS; | |
23 | diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c | |
24 | index f03f727..d425120 100644 | |
25 | --- a/core/rtw_sta_mgt.c | |
26 | +++ b/core/rtw_sta_mgt.c | |
27 | @@ -685,7 +685,7 @@ _func_exit_; | |
28 | } | |
29 | ||
30 | /* any station allocated can be searched by hash list */ | |
31 | -struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) | |
32 | +struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, const u8 *hwaddr) | |
33 | { | |
34 | ||
35 | _irqL irqL; | |
36 | @@ -696,7 +696,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) | |
37 | ||
38 | u32 index; | |
39 | ||
40 | - u8 *addr; | |
41 | + const u8 *addr; | |
42 | ||
43 | u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff}; | |
44 | ||
45 | diff --git a/include/osdep_service.h b/include/osdep_service.h | |
46 | index 76026b9..25809e4 100644 | |
47 | --- a/include/osdep_service.h | |
48 | +++ b/include/osdep_service.h | |
49 | @@ -255,8 +255,8 @@ void _rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_a | |
50 | extern void* rtw_malloc2d(int h, int w, int size); | |
51 | extern void rtw_mfree2d(void *pbuf, int h, int w, int size); | |
52 | ||
53 | -extern void _rtw_memcpy(void* dec, void* sour, u32 sz); | |
54 | -extern int _rtw_memcmp(void *dst, void *src, u32 sz); | |
55 | +extern void _rtw_memcpy(void* dec, const void* sour, u32 sz); | |
56 | +extern int _rtw_memcmp(const void *dst, const void *src, u32 sz); | |
57 | extern void _rtw_memset(void *pbuf, int c, u32 sz); | |
58 | ||
59 | extern void _rtw_init_listhead(_list *list); | |
60 | diff --git a/include/rtw_ioctl_set.h b/include/rtw_ioctl_set.h | |
61 | index da08376..10b3507 100644 | |
62 | --- a/include/rtw_ioctl_set.h | |
63 | +++ b/include/rtw_ioctl_set.h | |
64 | @@ -60,10 +60,10 @@ u8 rtw_set_802_11_bssid_list_scan(_adapter* padapter, NDIS_802_11_SSID *pssid, i | |
65 | u8 rtw_set_802_11_infrastructure_mode(_adapter * padapter, NDIS_802_11_NETWORK_INFRASTRUCTURE networktype); | |
66 | u8 rtw_set_802_11_remove_wep(_adapter * padapter, u32 keyindex); | |
67 | u8 rtw_set_802_11_ssid(_adapter * padapter, NDIS_802_11_SSID * ssid); | |
68 | -u8 rtw_set_802_11_connect(_adapter* padapter, u8 *bssid, NDIS_802_11_SSID *ssid); | |
69 | +u8 rtw_set_802_11_connect(_adapter* padapter, const u8 *bssid, NDIS_802_11_SSID *ssid); | |
70 | u8 rtw_set_802_11_remove_key(_adapter * padapter, NDIS_802_11_REMOVE_KEY * key); | |
71 | ||
72 | -u8 rtw_validate_bssid(u8 *bssid); | |
73 | +u8 rtw_validate_bssid(const u8 *bssid); | |
74 | u8 rtw_validate_ssid(NDIS_802_11_SSID *ssid); | |
75 | ||
76 | u16 rtw_get_cur_max_rate(_adapter *adapter); | |
77 | diff --git a/include/sta_info.h b/include/sta_info.h | |
78 | index 15964d7..553d5ab 100644 | |
79 | --- a/include/sta_info.h | |
80 | +++ b/include/sta_info.h | |
81 | @@ -443,7 +443,7 @@ struct sta_priv { | |
82 | }; | |
83 | ||
84 | ||
85 | -__inline static u32 wifi_mac_hash(u8 *mac) | |
86 | +__inline static u32 wifi_mac_hash(const u8 *mac) | |
87 | { | |
88 | u32 x; | |
89 | ||
90 | @@ -471,7 +471,7 @@ struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int offset) | |
91 | extern struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); | |
92 | extern u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta); | |
93 | extern void rtw_free_all_stainfo(_adapter *padapter); | |
94 | -extern struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); | |
95 | +extern struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, const u8 *hwaddr); | |
96 | extern u32 rtw_init_bcmc_stainfo(_adapter* padapter); | |
97 | extern struct sta_info* rtw_get_bcmc_stainfo(_adapter* padapter); | |
98 | extern u8 rtw_access_ctrl(_adapter *padapter, u8 *mac_addr); | |
99 | diff --git a/include/wifi.h b/include/wifi.h | |
100 | index dff95b4..d148ba8 100644 | |
101 | --- a/include/wifi.h | |
102 | +++ b/include/wifi.h | |
103 | @@ -431,7 +431,7 @@ enum WIFI_REG_DOMAIN { | |
104 | (addr[4] == 0xff) && (addr[5] == 0xff) ) ? _TRUE : _FALSE \ | |
105 | ) | |
106 | ||
107 | -__inline static int IS_MCAST(unsigned char *da) | |
108 | +__inline static int IS_MCAST(const unsigned char *da) | |
109 | { | |
110 | if ((*da) & 0x01) | |
111 | return _TRUE; | |
112 | diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c | |
113 | index 3abcad9..4b6ce41 100644 | |
114 | --- a/os_dep/linux/ioctl_cfg80211.c | |
115 | +++ b/os_dep/linux/ioctl_cfg80211.c | |
116 | @@ -2584,7 +2610,7 @@ static int rtw_cfg80211_set_key_mgt(struct security_priv *psecuritypriv, u32 key | |
117 | return 0; | |
118 | } | |
119 | ||
120 | -static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen) | |
121 | +static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, const u8 *pie, size_t ielen) | |
122 | { | |
123 | u8 *buf=NULL, *pos=NULL; | |
124 | u32 left; | |
125 | diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c | |
126 | index 97a904b..ae46f26 100644 | |
127 | --- a/os_dep/osdep_service.c | |
128 | +++ b/os_dep/osdep_service.c | |
129 | @@ -804,7 +804,7 @@ void rtw_mfree2d(void *pbuf, int h, int w, int size) | |
130 | rtw_mfree((u8 *)pbuf, h*sizeof(void*) + w*h*size); | |
131 | } | |
132 | ||
133 | -void _rtw_memcpy(void* dst, void* src, u32 sz) | |
134 | +void _rtw_memcpy(void* dst, const void* src, u32 sz) | |
135 | { | |
136 | ||
137 | #if defined (PLATFORM_LINUX)|| defined (PLATFORM_FREEBSD) | |
138 | @@ -821,7 +821,7 @@ void _rtw_memcpy(void* dst, void* src, u32 sz) | |
139 | ||
140 | } | |
141 | ||
142 | -int _rtw_memcmp(void *dst, void *src, u32 sz) | |
143 | +int _rtw_memcmp(const void *dst, const void *src, u32 sz) | |
144 | { | |
145 | ||
146 | #if defined (PLATFORM_LINUX)|| defined (PLATFORM_FREEBSD) |