Commit 3dc33e23 authored by David S. Miller's avatar David S. Miller

enic: Fix namespace pollution causing build errors.

drivers/net/built-in.o: In function `.vnic_wq_devcmd2_alloc':
(.text+0x49fe40): multiple definition of `.vnic_wq_devcmd2_alloc'
drivers/scsi/built-in.o:(.text+0xb4318): first defined here
drivers/net/built-in.o:(.opd+0x2af00): multiple definition of `vnic_wq_devcmd2_alloc'
drivers/scsi/built-in.o:(.opd+0xad70): first defined here
drivers/net/built-in.o: In function `.vnic_wq_init_start':
(.text+0x49f9c0): multiple definition of `.vnic_wq_init_start'
drivers/scsi/built-in.o:(.text+0xb3b58): first defined here
drivers/net/built-in.o:(.opd+0x2ae88): multiple definition of `vnic_wq_init_start'
drivers/scsi/built-in.o:(.opd+0xace0): first defined here

Rename these to 'enic_*' to avoid the conflict with the functiosn of
the same name in the snic scsi driver.
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f34fa14c
...@@ -388,7 +388,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) ...@@ -388,7 +388,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev)
vdev->devcmd2->color = 1; vdev->devcmd2->color = 1;
vdev->devcmd2->result_size = DEVCMD2_RING_SIZE; vdev->devcmd2->result_size = DEVCMD2_RING_SIZE;
err = vnic_wq_devcmd2_alloc(vdev, &vdev->devcmd2->wq, DEVCMD2_RING_SIZE, err = enic_wq_devcmd2_alloc(vdev, &vdev->devcmd2->wq, DEVCMD2_RING_SIZE,
DEVCMD2_DESC_SIZE); DEVCMD2_DESC_SIZE);
if (err) if (err)
goto err_free_devcmd2; goto err_free_devcmd2;
...@@ -400,7 +400,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) ...@@ -400,7 +400,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev)
return -ENODEV; return -ENODEV;
} }
vnic_wq_init_start(&vdev->devcmd2->wq, 0, fetch_index, fetch_index, 0, enic_wq_init_start(&vdev->devcmd2->wq, 0, fetch_index, fetch_index, 0,
0); 0);
vnic_wq_enable(&vdev->devcmd2->wq); vnic_wq_enable(&vdev->devcmd2->wq);
......
...@@ -114,7 +114,7 @@ int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index, ...@@ -114,7 +114,7 @@ int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
return 0; return 0;
} }
int vnic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, int enic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
unsigned int desc_count, unsigned int desc_size) unsigned int desc_count, unsigned int desc_size)
{ {
int err; int err;
...@@ -131,7 +131,7 @@ int vnic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, ...@@ -131,7 +131,7 @@ int vnic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
return err; return err;
} }
void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index, void enic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
unsigned int fetch_index, unsigned int posted_index, unsigned int fetch_index, unsigned int posted_index,
unsigned int error_interrupt_enable, unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset) unsigned int error_interrupt_offset)
...@@ -158,7 +158,7 @@ void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index, ...@@ -158,7 +158,7 @@ void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
unsigned int error_interrupt_enable, unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset) unsigned int error_interrupt_offset)
{ {
vnic_wq_init_start(wq, cq_index, 0, 0, enic_wq_init_start(wq, cq_index, 0, 0,
error_interrupt_enable, error_interrupt_enable,
error_interrupt_offset); error_interrupt_offset);
} }
......
...@@ -185,9 +185,9 @@ void vnic_wq_enable(struct vnic_wq *wq); ...@@ -185,9 +185,9 @@ void vnic_wq_enable(struct vnic_wq *wq);
int vnic_wq_disable(struct vnic_wq *wq); int vnic_wq_disable(struct vnic_wq *wq);
void vnic_wq_clean(struct vnic_wq *wq, void vnic_wq_clean(struct vnic_wq *wq,
void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf)); void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf));
int vnic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, int enic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
unsigned int desc_count, unsigned int desc_size); unsigned int desc_count, unsigned int desc_size);
void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index, void enic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
unsigned int fetch_index, unsigned int posted_index, unsigned int fetch_index, unsigned int posted_index,
unsigned int error_interrupt_enable, unsigned int error_interrupt_enable,
unsigned int error_interrupt_offset); unsigned int error_interrupt_offset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment