This patch adds licensing information, description and author to the module.
Signed-off-by: Christian Lamparter <[email protected]>
---
Luis,
what does your secretary say?
As we are "borrowing" dual licensed code and I guess Atheros wants
to keep their code "this way", right?
Regards,
Chr
---
diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile
index a005b91..4bb0132 100644
--- a/drivers/net/wireless/ath/Makefile
+++ b/drivers/net/wireless/ath/Makefile
@@ -3,5 +3,4 @@ obj-$(CONFIG_ATH9K) += ath9k/
obj-$(CONFIG_AR9170_USB) += ar9170/
obj-$(CONFIG_ATH_COMMON) += ath.o
-ath-objs := regd.o
-
+ath-objs := main.o regd.o
diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
new file mode 100644
index 0000000..c5eb144
--- /dev/null
+++ b/drivers/net/wireless/ath/main.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2008-2009 Atheros Communications Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+MODULE_AUTHOR("Atheros Communications");
+MODULE_DESCRIPTION("Shared library for Atheros wireless LAN cards.");
+MODULE_LICENSE("Dual BSD/GPL");
+
+static int __init ath_init(void)
+{
+ return 0;
+}
+module_init(ath_init);
+
+static void __exit ath_exit(void)
+{
+}
+module_exit(ath_exit);
On Mon, Apr 13, 2009 at 10:44:23PM +0200, Christian Lamparter wrote:
> diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile
> index a005b91..4bb0132 100644
> --- a/drivers/net/wireless/ath/Makefile
> +++ b/drivers/net/wireless/ath/Makefile
> @@ -3,5 +3,4 @@ obj-$(CONFIG_ATH9K) += ath9k/
> obj-$(CONFIG_AR9170_USB) += ar9170/
>
> obj-$(CONFIG_ATH_COMMON) += ath.o
> -ath-objs := regd.o
> -
> +ath-objs := main.o regd.o
why do you put that in a different file and not in ath.c?
> diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
> new file mode 100644
> index 0000000..c5eb144
> --- /dev/null
> +++ b/drivers/net/wireless/ath/main.c
> @@ -0,0 +1,33 @@
> +/*
> + * Copyright (c) 2008-2009 Atheros Communications Inc.
> + *
> + * Permission to use, copy, modify, and/or distribute this software for any
> + * purpose with or without fee is hereby granted, provided that the above
> + * copyright notice and this permission notice appear in all copies.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +
> +MODULE_AUTHOR("Atheros Communications");
> +MODULE_DESCRIPTION("Shared library for Atheros wireless LAN cards.");
> +MODULE_LICENSE("Dual BSD/GPL");
> +
> +static int __init ath_init(void)
> +{
> + return 0;
> +}
> +module_init(ath_init);
> +
> +static void __exit ath_exit(void)
> +{
> +}
> +module_exit(ath_exit);
> +static int __init ath_init(void)
> +{
> + return 0;
> +}
> +module_init(ath_init);
> +
> +static void __exit ath_exit(void)
> +{
> +}
> +module_exit(ath_exit);
No need for these.
On Monday 13 April 2009 22:44:30 maximilian attems wrote:
> On Mon, Apr 13, 2009 at 10:44:23PM +0200, Christian Lamparter wrote:
> > diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile
> > index a005b91..4bb0132 100644
> > --- a/drivers/net/wireless/ath/Makefile
> > +++ b/drivers/net/wireless/ath/Makefile
> > @@ -3,5 +3,4 @@ obj-$(CONFIG_ATH9K) += ath9k/
> > obj-$(CONFIG_AR9170_USB) += ar9170/
> >
> > obj-$(CONFIG_ATH_COMMON) += ath.o
> > -ath-objs := regd.o
> > -
> > +ath-objs := main.o regd.o
>
> why do you put that in a different file and not in ath.c?
which ath.c?
besides, is this possible?
as kbuild will then generate two ath.o
- one from ath.c.
- when all ath-objs are merged into ath.o
so we end up reading & writing to the same file?!
Regards,
Chr
On Mon, Apr 13, 2009 at 1:44 PM, maximilian attems <[email protected]> wrote:
> On Mon, Apr 13, 2009 at 10:44:23PM +0200, Christian Lamparter wrote:
>> diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireles=
s/ath/Makefile
>> index a005b91..4bb0132 100644
>> --- a/drivers/net/wireless/ath/Makefile
>> +++ b/drivers/net/wireless/ath/Makefile
>> @@ -3,5 +3,4 @@ obj-$(CONFIG_ATH9K) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
+=3D ath9k/
>> =C2=A0obj-$(CONFIG_AR9170_USB) =C2=A0 =C2=A0 =C2=A0 =C2=A0+=3D ar917=
0/
>>
>> =C2=A0obj-$(CONFIG_ATH_COMMON) =C2=A0 =C2=A0 +=3D ath.o
>> -ath-objs =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 :=3D regd.o
>> -
>> +ath-objs =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 :=3D main.o regd=
=2Eo
>
> why do you put that in a different file and not in ath.c?
Apart from this objection, looks good -- and thanks.
Luis
This patch adds licensing, author information and a description to the module.
Signed-off-by: Christian Lamparter <[email protected]>
---
On Tuesday 14 April 2009 13:58:43 Christoph Hellwig wrote:
> > [module_init & module_exit stubs]
>
> No need for these.
OK! will remove the ones in p54common.c too.
---
diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wireless/ath/Makefile
index a005b91..4bb0132 100644
--- a/drivers/net/wireless/ath/Makefile
+++ b/drivers/net/wireless/ath/Makefile
@@ -3,5 +3,4 @@ obj-$(CONFIG_ATH9K) += ath9k/
obj-$(CONFIG_AR9170_USB) += ar9170/
obj-$(CONFIG_ATH_COMMON) += ath.o
-ath-objs := regd.o
-
+ath-objs := main.o regd.o
diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
new file mode 100644
index 0000000..c5eb144
--- /dev/null
+++ b/drivers/net/wireless/ath/main.c
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2009 Atheros Communications Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+MODULE_AUTHOR("Atheros Communications");
+MODULE_DESCRIPTION("Shared library for Atheros wireless LAN cards.");
+MODULE_LICENSE("Dual BSD/GPL");
On Mon, Apr 13, 2009 at 2:00 PM, Luis R. Rodriguez
<[email protected]> wrote:
> On Mon, Apr 13, 2009 at 1:44 PM, maximilian attems <[email protected]> wrot=
e:
>> On Mon, Apr 13, 2009 at 10:44:23PM +0200, Christian Lamparter wrote:
>>> diff --git a/drivers/net/wireless/ath/Makefile b/drivers/net/wirele=
ss/ath/Makefile
>>> index a005b91..4bb0132 100644
>>> --- a/drivers/net/wireless/ath/Makefile
>>> +++ b/drivers/net/wireless/ath/Makefile
>>> @@ -3,5 +3,4 @@ obj-$(CONFIG_ATH9K) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 +=3D ath9k/
>>> =C2=A0obj-$(CONFIG_AR9170_USB) =C2=A0 =C2=A0 =C2=A0 =C2=A0+=3D ar91=
70/
>>>
>>> =C2=A0obj-$(CONFIG_ATH_COMMON) =C2=A0 =C2=A0 +=3D ath.o
>>> -ath-objs =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 :=3D regd.o
>>> -
>>> +ath-objs =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 :=3D main.o reg=
d.o
>>
>> why do you put that in a different file and not in ath.c?
>
> Apart from this objection, looks good -- and thanks.
Actually a new file makes sense -- we might later add more stuff other
than regulatory. That is the idea.
Luis
On Mon, Apr 13, 2009 at 5:00 PM, Luis R. Rodriguez
<[email protected]> wrote:
>> why do you put that in a different file and not in ath.c?
>
> Apart from this objection, looks good -- and thanks.
Because there is no ath.c? :)
I like it, thanks Christian.
--
Bob Copeland %% http://www.bobcopeland.com