Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/cisco/enic/vnic_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) 


	vdev->devcmd2->color = 1;

	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);

	if (err)

		goto err_free_devcmd2;
@@ -400,7 +400,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) 
		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);

	vnic_wq_enable(&vdev->devcmd2->wq);

drivers/net/ethernet/cisco/enic/vnic_wq.c

+3 −3
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index, 
	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)

{

	int err;
@@ -131,7 +131,7 @@ int vnic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, 
	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 error_interrupt_enable,

			unsigned int error_interrupt_offset)
@@ -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_offset)

{

	vnic_wq_init_start(wq, cq_index, 0, 0,

	enic_wq_init_start(wq, cq_index, 0, 0,

		error_interrupt_enable,

		error_interrupt_offset);

}

drivers/net/ethernet/cisco/enic/vnic_wq.h

+2 −2
Original line number Diff line number Diff line
@@ -185,9 +185,9 @@ void vnic_wq_enable(struct vnic_wq *wq); 
int vnic_wq_disable(struct vnic_wq *wq);

void vnic_wq_clean(struct vnic_wq *wq,

	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);

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 error_interrupt_enable,

			unsigned int error_interrupt_offset);