Skip to contentSkip to conversation

net/wireless: make two frequency_list static

PATCH Applied Adrian Bunk 2 participants 2 messages Jun 17, 2003

Subsystems (2)
Networking drivers (wireless) Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 net/wireless: make two frequency_list static

2.5 kernels up to 2.5.72 fail to compile with the following error:

<-- snip -->

...
LD
drivers/net/wireless/built-in.o drivers/net/wireless/atmel.o(.rodata+0x1a0):
multiple definition of `frequency_list' drivers/net/wireless/airo.o(.rodata+0x0): first defined here make[3]: *** [drivers/net/wireless/built-in.o] Error 1

<-- snip -->

the patch below makes both frequency_list static.

I've tested the compilation with 2.5.72.

cu
Adrian

drivers/net/wireless/airo.c renamed from drivers/net/wireless/airo.c.old +1 -1
@@ -889,7 +889,7 @@
 
 #ifdef WIRELESS_EXT
 // Frequency list (map channels to frequencies)
-const long frequency_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
+static const long frequency_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
 				2447, 2452, 2457, 2462, 2467, 2472, 2484 };
 
 // A few details needed for WEP (Wireless Equivalent Privacy)
drivers/net/wireless/atmel.c renamed from drivers/net/wireless/atmel.c.old +1 -1
@@ -1903,7 +1903,7 @@
 	return 0;
 }
 
-const long frequency_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
+static const long frequency_list[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
 				2447, 2452, 2457, 2462, 2467, 2472, 2484 };
 
 static int atmel_set_freq(struct net_device *dev,
Applied
#1 lore raw

From: Adrian Bunk <[email protected]>
Date: Tue, 17 Jun 2003 23:10:44 +0200

the patch below makes both frequency_list static.

I've tested the compilation with 2.5.72.

Applied, thanks.