---

yaml --- r: 318165 b: refs/heads/master c: 85a334e h: refs/heads/master i: 318163: 85500a7 v: v3
git-mirror · Jul 20, 2012 · d8159bd · d8159bd
1 parent c346643
commit d8159bd
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7244a31e160c4c43043962228e61ae00b03b4c3
+refs/heads/master: 85a334e3ce9cc94ab02968882ba7235237c7920d
diff --git a/trunk/drivers/staging/csr/csr_util.c b/trunk/drivers/staging/csr/csr_util.c
@@ -48,12 +48,6 @@ void *CsrMemMove(void *dest, const void *src, size_t count)
     return memmove(dest, src, count);
 }
 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
 
 #ifndef CSR_USE_STDC_LIB

diff --git a/trunk/drivers/staging/csr/csr_util.h b/trunk/drivers/staging/csr/csr_util.h
@@ -31,7 +31,6 @@ void CsrUInt16ToHex(u16 number, char *str);
 #define CsrMemMove memmove
 #define CsrStrCpy strcpy
 #define CsrStrNCpy strncpy
-#define CsrMemCmp(s1, s2, n) ((s32) memcmp((s1), (s2), (n)))
 #define CsrStrCmp(s1, s2) ((s32) strcmp((s1), (s2)))
 #define CsrStrNCmp(s1, s2, n) ((s32) strncmp((s1), (s2), (n)))
 #define CsrStrChr strchr
@@ -41,7 +40,6 @@ void *CsrMemCpy(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 *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 CsrStrNCmp(const char *string1, const char *string2, size_t count);
 char *CsrStrChr(const char *string, char c);

diff --git a/trunk/drivers/staging/csr/csr_wifi_hip_ta_sampling.c b/trunk/drivers/staging/csr/csr_wifi_hip_ta_sampling.c
@@ -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)
     {
         /* 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_ta_indicate_protocol(card->ospriv, CSR_WIFI_ROUTER_CTRL_TRAFFIC_PACKET_TYPE_AIRONET,