---

yaml
---
r: 268214
b: refs/heads/master
c: d2bac23
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95ccc2f72c3a74cef5b0eebdbbf813cdcc10086a
+refs/heads/master: d2bac23d7640d7fa709954befbbe2e5ea13c63f8

trunk/drivers/staging/brcm80211/brcmsmac/alloc.c

@@ -1,4 +1,4 @@
-/*
+#/*
  * Copyright (c) 2010 Broadcom Corporation
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -20,13 +20,6 @@
 #include "main.h"
 #include "alloc.h"
 
-static struct brcms_bss_cfg *brcms_c_bsscfg_malloc(uint unit);
-static void brcms_c_bsscfg_mfree(struct brcms_bss_cfg *cfg);
-static struct brcms_pub *brcms_c_pub_malloc(uint unit,
-				      uint *err, uint devid);
-static void brcms_c_pub_mfree(struct brcms_pub *pub);
-static void brcms_c_tunables_init(struct brcms_tunables *tunables, uint devid);
-
 static void brcms_c_tunables_init(struct brcms_tunables *tunables, uint devid)
 {
 	tunables->ntxd = NTXD;
@@ -45,6 +38,16 @@ static void brcms_c_tunables_init(struct brcms_tunables *tunables, uint devid)
 	tunables->txsbnd = TXSBND;
 }
 
+static void brcms_c_pub_mfree(struct brcms_pub *pub)
+{
+	if (pub == NULL)
+		return;
+
+	kfree(pub->multicast);
+	kfree(pub->tunables);
+	kfree(pub);
+}
+
 static struct brcms_pub *brcms_c_pub_malloc(uint unit, uint *err, uint devid)
 {
 	struct brcms_pub *pub;
@@ -77,14 +80,14 @@ static struct brcms_pub *brcms_c_pub_malloc(uint unit, uint *err, uint devid)
 	return NULL;
 }
 
-static void brcms_c_pub_mfree(struct brcms_pub *pub)
+static void brcms_c_bsscfg_mfree(struct brcms_bss_cfg *cfg)
 {
-	if (pub == NULL)
+	if (cfg == NULL)
 		return;
 
-	kfree(pub->multicast);
-	kfree(pub->tunables);
-	kfree(pub);
+	kfree(cfg->maclist);
+	kfree(cfg->current_bss);
+	kfree(cfg);
 }
 
 static struct brcms_bss_cfg *brcms_c_bsscfg_malloc(uint unit)
@@ -106,16 +109,6 @@ static struct brcms_bss_cfg *brcms_c_bsscfg_malloc(uint unit)
 	return NULL;
 }
 
-static void brcms_c_bsscfg_mfree(struct brcms_bss_cfg *cfg)
-{
-	if (cfg == NULL)
-		return;
-
-	kfree(cfg->maclist);
-	kfree(cfg->current_bss);
-	kfree(cfg);
-}
-
 static void brcms_c_bsscfg_ID_assign(struct brcms_c_info *wlc,
 				 struct brcms_bss_cfg *bsscfg)
 {