diff options
author | Michael Chan <mchan@broadcom.com> | 2009-06-08 21:14:43 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-09 11:22:42 -0400 |
commit | a463696039f7097ce87c21db3cf5c16cdcb3850d (patch) | |
tree | 3308681e117008282fd73a224215e0aab173262e /drivers/net/Makefile | |
parent | 4edd473f208cff77ce1f7ef26d5a41f31fa198e0 (diff) |
[SCSI] cnic: Add new Broadcom CNIC driver.
The CNIC driver controls BNX2 hardware rings and resources used by
iSCSI. Most hardware resources for iSCSI are separate from those
used for ethernet networking.
iSCSI uses a separate MAC address and IP address. The CNIC driver
creates a UIO interface to handle the non-offloaded packets such as
ARP, etc in userspace.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r-- | drivers/net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 1fc4602a6ff2..e6f1f8c3f8d4 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -73,6 +73,7 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o | |||
73 | obj-$(CONFIG_FEALNX) += fealnx.o | 73 | obj-$(CONFIG_FEALNX) += fealnx.o |
74 | obj-$(CONFIG_TIGON3) += tg3.o | 74 | obj-$(CONFIG_TIGON3) += tg3.o |
75 | obj-$(CONFIG_BNX2) += bnx2.o | 75 | obj-$(CONFIG_BNX2) += bnx2.o |
76 | obj-$(CONFIG_CNIC) += cnic.o | ||
76 | obj-$(CONFIG_BNX2X) += bnx2x.o | 77 | obj-$(CONFIG_BNX2X) += bnx2x.o |
77 | bnx2x-objs := bnx2x_main.o bnx2x_link.o | 78 | bnx2x-objs := bnx2x_main.o bnx2x_link.o |
78 | spidernet-y += spider_net.o spider_net_ethtool.o | 79 | spidernet-y += spider_net.o spider_net_ethtool.o |