* [PATCH net-dev2.6] bxn2x: Fix location of PCI-ids defines
@ 2011-03-17 12:27 Ariel Elior
2011-03-17 13:06 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Ariel Elior @ 2011-03-17 12:27 UTC (permalink / raw)
To: davem; +Cc: eilong, netdev
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/bnx2x/bnx2x_main.c | 7 -------
include/linux/pci_ids.h | 2 ++
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_main.c
b/drivers/net/bnx2x/bnx2x_main.c
index 10bc0a6..ab2fc65 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -145,13 +145,6 @@ static struct {
{ "Broadcom NetXtreme II BCM57712E XGb" }
};
-#ifndef PCI_DEVICE_ID_NX2_57712
-#define PCI_DEVICE_ID_NX2_57712 0x1662
-#endif
-#ifndef PCI_DEVICE_ID_NX2_57712E
-#define PCI_DEVICE_ID_NX2_57712E 0x1663
-#endif
-
static DEFINE_PCI_DEVICE_TABLE(bnx2x_pci_tbl) = {
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 },
{ PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 },
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3adb06e..f82986b 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2078,6 +2078,8 @@
#define PCI_DEVICE_ID_TIGON3_5723 0x165b
#define PCI_DEVICE_ID_TIGON3_5705M 0x165d
#define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e
+#define PCI_DEVICE_ID_NX2_57712 0x1662
+#define PCI_DEVICE_ID_NX2_57712E 0x1663
#define PCI_DEVICE_ID_TIGON3_5714 0x1668
#define PCI_DEVICE_ID_TIGON3_5714S 0x1669
#define PCI_DEVICE_ID_TIGON3_5780 0x166a
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-dev2.6] bxn2x: Fix location of PCI-ids defines
2011-03-17 12:27 [PATCH net-dev2.6] bxn2x: Fix location of PCI-ids defines Ariel Elior
@ 2011-03-17 13:06 ` David Miller
2011-03-17 13:13 ` Eilon Greenstein
0 siblings, 1 reply; 6+ messages in thread
From: David Miller @ 2011-03-17 13:06 UTC (permalink / raw)
To: ariele; +Cc: eilong, netdev
From: "Ariel Elior" <ariele@broadcom.com>
Date: Thu, 17 Mar 2011 14:27:04 +0200
> Signed-off-by: Ariel Elior <ariele@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Unless you intend to reference these symbols elsewhere in the
kernel, they should stay private in your driver.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-dev2.6] bxn2x: Fix location of PCI-ids defines
2011-03-17 13:06 ` David Miller
@ 2011-03-17 13:13 ` Eilon Greenstein
2011-03-17 15:10 ` David Miller
2011-03-18 22:13 ` David Miller
0 siblings, 2 replies; 6+ messages in thread
From: Eilon Greenstein @ 2011-03-17 13:13 UTC (permalink / raw)
To: David Miller; +Cc: Ariel Elior, netdev
On Thu, 2011-03-17 at 06:06 -0700, David Miller wrote:
> From: "Ariel Elior" <ariele@broadcom.com>
> Date: Thu, 17 Mar 2011 14:27:04 +0200
>
> > Signed-off-by: Ariel Elior <ariele@broadcom.com>
> > Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
>
> Unless you intend to reference these symbols elsewhere in the
> kernel, they should stay private in your driver.
>
The bnx2i will need it as well. Isn't it better to keep all the PCI IDs
in the same global location?
Thanks,
Eilon
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-dev2.6] bxn2x: Fix location of PCI-ids defines
2011-03-17 13:13 ` Eilon Greenstein
@ 2011-03-17 15:10 ` David Miller
2011-03-17 17:32 ` Michael Chan
2011-03-18 22:13 ` David Miller
1 sibling, 1 reply; 6+ messages in thread
From: David Miller @ 2011-03-17 15:10 UTC (permalink / raw)
To: eilong; +Cc: ariele, netdev
From: "Eilon Greenstein" <eilong@broadcom.com>
Date: Thu, 17 Mar 2011 15:13:33 +0200
> On Thu, 2011-03-17 at 06:06 -0700, David Miller wrote:
>> From: "Ariel Elior" <ariele@broadcom.com>
>> Date: Thu, 17 Mar 2011 14:27:04 +0200
>>
>> > Signed-off-by: Ariel Elior <ariele@broadcom.com>
>> > Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
>>
>> Unless you intend to reference these symbols elsewhere in the
>> kernel, they should stay private in your driver.
>>
>
> The bnx2i will need it as well. Isn't it better to keep all the PCI IDs
> in the same global location?
If they are used in more than one driver, yes.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-dev2.6] bxn2x: Fix location of PCI-ids defines
2011-03-17 15:10 ` David Miller
@ 2011-03-17 17:32 ` Michael Chan
0 siblings, 0 replies; 6+ messages in thread
From: Michael Chan @ 2011-03-17 17:32 UTC (permalink / raw)
To: David Miller; +Cc: Eilon Greenstein, Ariel Elior, netdev
On Thu, 2011-03-17 at 08:10 -0700, David Miller wrote:
> From: "Eilon Greenstein" <eilong@broadcom.com>
> Date: Thu, 17 Mar 2011 15:13:33 +0200
>
> > On Thu, 2011-03-17 at 06:06 -0700, David Miller wrote:
> >> From: "Ariel Elior" <ariele@broadcom.com>
> >> Date: Thu, 17 Mar 2011 14:27:04 +0200
> >>
> >> > Signed-off-by: Ariel Elior <ariele@broadcom.com>
> >> > Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
> >>
> >> Unless you intend to reference these symbols elsewhere in the
> >> kernel, they should stay private in your driver.
> >>
> >
> > The bnx2i will need it as well. Isn't it better to keep all the PCI IDs
> > in the same global location?
>
> If they are used in more than one driver, yes.
We already sent a similar patch through the scsi tree. It is now in the
linux-next tree:
http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commit;h=8a4a0f3ad071e258a9637c5491c34005a9a97903
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-dev2.6] bxn2x: Fix location of PCI-ids defines
2011-03-17 13:13 ` Eilon Greenstein
2011-03-17 15:10 ` David Miller
@ 2011-03-18 22:13 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2011-03-18 22:13 UTC (permalink / raw)
To: eilong; +Cc: ariele, netdev
From: "Eilon Greenstein" <eilong@broadcom.com>
Date: Thu, 17 Mar 2011 15:13:33 +0200
> On Thu, 2011-03-17 at 06:06 -0700, David Miller wrote:
>> From: "Ariel Elior" <ariele@broadcom.com>
>> Date: Thu, 17 Mar 2011 14:27:04 +0200
>>
>> > Signed-off-by: Ariel Elior <ariele@broadcom.com>
>> > Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
>>
>> Unless you intend to reference these symbols elsewhere in the
>> kernel, they should stay private in your driver.
>>
>
> The bnx2i will need it as well. Isn't it better to keep all the PCI IDs
> in the same global location?
It looks like this change propagated to Linus via the scsi tree or
similar, so I don't need to apply it.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-18 22:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-17 12:27 [PATCH net-dev2.6] bxn2x: Fix location of PCI-ids defines Ariel Elior
2011-03-17 13:06 ` David Miller
2011-03-17 13:13 ` Eilon Greenstein
2011-03-17 15:10 ` David Miller
2011-03-17 17:32 ` Michael Chan
2011-03-18 22:13 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).