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

Commit 7eb344f8 authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

rocker: fix non-portable err return codes 



The rocker device returns error codes if something goes wrong with descriptor
processing.  Originally the device used standard errno codes for different
errors, but since those errno codes aren't portable across ARCHs, the device
now returns hard-coded error codes that stay constant across diff ARCHs.  Fix
driver to use those same hard-coded values.

Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 009f33ed

drivers/net/ethernet/rocker/rocker.c

+24 −1
Original line number Diff line number Diff line
@@ -789,7 +789,30 @@ static u32 __pos_inc(u32 pos, size_t limit) 


static int rocker_desc_err(struct rocker_desc_info *desc_info)

{

	return -(desc_info->desc->comp_err & ~ROCKER_DMA_DESC_COMP_ERR_GEN);

	int err = desc_info->desc->comp_err & ~ROCKER_DMA_DESC_COMP_ERR_GEN;



	switch (err) {

	case ROCKER_OK:

		return 0;

	case -ROCKER_ENOENT:

		return -ENOENT;

	case -ROCKER_ENXIO:

		return -ENXIO;

	case -ROCKER_ENOMEM:

		return -ENOMEM;

	case -ROCKER_EEXIST:

		return -EEXIST;

	case -ROCKER_EINVAL:

		return -EINVAL;

	case -ROCKER_EMSGSIZE:

		return -EMSGSIZE;

	case -ROCKER_ENOTSUP:

		return -EOPNOTSUPP;

	case -ROCKER_ENOBUFS:

		return -ENOBUFS;

	}



	return -EINVAL;

}



static void rocker_desc_gen_clear(struct rocker_desc_info *desc_info)

drivers/net/ethernet/rocker/rocker.h

+13 −0
Original line number Diff line number Diff line
@@ -14,6 +14,19 @@ 


#include <linux/types.h>



/* Return codes */

enum {

	ROCKER_OK = 0,

	ROCKER_ENOENT = 2,

	ROCKER_ENXIO = 6,

	ROCKER_ENOMEM = 12,

	ROCKER_EEXIST = 17,

	ROCKER_EINVAL = 22,

	ROCKER_EMSGSIZE = 90,

	ROCKER_ENOTSUP = 95,

	ROCKER_ENOBUFS = 105,

};



#define PCI_VENDOR_ID_REDHAT		0x1b36

#define PCI_DEVICE_ID_REDHAT_ROCKER	0x0006