Commit 85a334e3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: csr: remove CsrMemCmp

It's really just memcmp(), so call that instead.

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b7244a31
...@@ -48,12 +48,6 @@ void *CsrMemMove(void *dest, const void *src, size_t count) ...@@ -48,12 +48,6 @@ void *CsrMemMove(void *dest, const void *src, size_t count)
return memmove(dest, src, count); return memmove(dest, src, count);
} }
EXPORT_SYMBOL_GPL(CsrMemMove); EXPORT_SYMBOL_GPL(CsrMemMove);
s32 CsrMemCmp(const void *buf1, const void *buf2, size_t count)
{
return memcmp(buf1, buf2, count);
}
EXPORT_SYMBOL_GPL(CsrMemCmp);
#endif #endif
#ifndef CSR_USE_STDC_LIB #ifndef CSR_USE_STDC_LIB
......
...@@ -31,7 +31,6 @@ void CsrUInt16ToHex(u16 number, char *str); ...@@ -31,7 +31,6 @@ void CsrUInt16ToHex(u16 number, char *str);
#define CsrMemMove memmove #define CsrMemMove memmove
#define CsrStrCpy strcpy #define CsrStrCpy strcpy
#define CsrStrNCpy strncpy #define CsrStrNCpy strncpy
#define CsrMemCmp(s1, s2, n) ((s32) memcmp((s1), (s2), (n)))
#define CsrStrCmp(s1, s2) ((s32) strcmp((s1), (s2))) #define CsrStrCmp(s1, s2) ((s32) strcmp((s1), (s2)))
#define CsrStrNCmp(s1, s2, n) ((s32) strncmp((s1), (s2), (n))) #define CsrStrNCmp(s1, s2, n) ((s32) strncmp((s1), (s2), (n)))
#define CsrStrChr strchr #define CsrStrChr strchr
...@@ -41,7 +40,6 @@ void *CsrMemCpy(void *dest, const void *src, size_t count); ...@@ -41,7 +40,6 @@ void *CsrMemCpy(void *dest, const void *src, size_t count);
void *CsrMemMove(void *dest, const void *src, size_t count); void *CsrMemMove(void *dest, const void *src, size_t count);
char *CsrStrCpy(char *dest, const char *src); char *CsrStrCpy(char *dest, const char *src);
char *CsrStrNCpy(char *dest, const char *src, size_t count); char *CsrStrNCpy(char *dest, const char *src, size_t count);
s32 CsrMemCmp(const void *buf1, const void *buf2, size_t count);
s32 CsrStrCmp(const char *string1, const char *string2); s32 CsrStrCmp(const char *string1, const char *string2);
s32 CsrStrNCmp(const char *string1, const char *string2, size_t count); s32 CsrStrNCmp(const char *string1, const char *string2, size_t count);
char *CsrStrChr(const char *string, char c); char *CsrStrChr(const char *string, char c);
......
...@@ -257,7 +257,7 @@ static enum ta_frame_identity ta_detect_protocol(card_t *card, CsrWifiRouterCtrl ...@@ -257,7 +257,7 @@ static enum ta_frame_identity ta_detect_protocol(card_t *card, CsrWifiRouterCtrl
else if (tad->packet_filter & CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_AIRONET) else if (tad->packet_filter & CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_AIRONET)
{ {
/* detect Aironet frames */ /* detect Aironet frames */
if (!CsrMemCmp(data->os_data_ptr + 3, aironet_snap, 5)) if (!memcmp(data->os_data_ptr + 3, aironet_snap, 5))
{ {
UNIFI_MAC_ADDRESS_COPY(srcAddress.a, saddr); UNIFI_MAC_ADDRESS_COPY(srcAddress.a, saddr);
unifi_ta_indicate_protocol(card->ospriv, CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_AIRONET, unifi_ta_indicate_protocol(card->ospriv, CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_AIRONET,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment