diff -r b851951738f4 drivers/xen/sfc_netback/accel.c --- a/drivers/xen/sfc_netback/accel.c +++ b/drivers/xen/sfc_netback/accel.c @@ -71,8 +71,8 @@ static struct notifier_block netback_acc }; -unsigned max_pages = NETBACK_ACCEL_DEFAULT_MAX_BUF_PAGES; -module_param(max_pages, int, 0666); +unsigned sfc_netback_max_pages = NETBACK_ACCEL_DEFAULT_MAX_BUF_PAGES; +module_param_named(max_pages, sfc_netback_max_pages, uint, 0666); MODULE_PARM_DESC(max_pages, "The number of buffer pages to enforce on each guest"); diff -r b851951738f4 drivers/xen/sfc_netback/accel.h --- a/drivers/xen/sfc_netback/accel.h +++ b/drivers/xen/sfc_netback/accel.h @@ -49,7 +49,7 @@ #define NETBACK_ACCEL_DEFAULT_MAX_MCASTS (8) #define NETBACK_ACCEL_DEFAULT_MAX_BUF_PAGES (384) /* Variable to store module parameter for max_buf_pages */ -extern unsigned max_pages; +extern unsigned sfc_netback_max_pages; #define NETBACK_ACCEL_STATS 1 diff -r b851951738f4 drivers/xen/sfc_netback/accel_xenbus.c --- a/drivers/xen/sfc_netback/accel_xenbus.c +++ b/drivers/xen/sfc_netback/accel_xenbus.c @@ -113,7 +113,7 @@ void cfg_hw_quotas(struct xenbus_device */ DPRINTK("Failed to read quotas from xenbus, using defaults\n"); bend->quotas.max_filters = NETBACK_ACCEL_DEFAULT_MAX_FILTERS; - bend->quotas.max_buf_pages = max_pages; + bend->quotas.max_buf_pages = sfc_netback_max_pages; bend->quotas.max_mcasts = NETBACK_ACCEL_DEFAULT_MAX_MCASTS; } diff -r b851951738f4 drivers/xen/sfc_netfront/accel.h --- a/drivers/xen/sfc_netfront/accel.h +++ b/drivers/xen/sfc_netfront/accel.h @@ -336,8 +336,8 @@ typedef struct netfront_accel_vnic { /* Module parameters */ -extern unsigned max_pages; -extern unsigned buffer_split; +extern unsigned sfc_netfront_max_pages; +extern unsigned sfc_netfront_buffer_split; extern const char *frontend_name; extern struct netfront_accel_hooks accel_hooks; diff -r b851951738f4 drivers/xen/sfc_netfront/accel_bufs.c --- a/drivers/xen/sfc_netfront/accel_bufs.c +++ b/drivers/xen/sfc_netfront/accel_bufs.c @@ -72,12 +72,12 @@ int netfront_accel_alloc_buffer_mem(stru int n, rc; if ((rc = netfront_accel_alloc_buf_desc_blocks - (rx_manager, pages - (pages / buffer_split))) < 0) { + (rx_manager, pages - (pages / sfc_netfront_buffer_split))) < 0) { goto rx_fail; } if ((rc = netfront_accel_alloc_buf_desc_blocks - (tx_manager, pages / buffer_split)) < 0) { + (tx_manager, pages / sfc_netfront_buffer_split)) < 0) { goto tx_fail; } diff -r b851951738f4 drivers/xen/sfc_netfront/accel_msg.c --- a/drivers/xen/sfc_netfront/accel_msg.c +++ b/drivers/xen/sfc_netfront/accel_msg.c @@ -157,7 +157,7 @@ static int vnic_add_bufs(netfront_accel_ offset = msg->u.mapbufs.reqid; if (offset < vnic->bufpages.max_pages - - (vnic->bufpages.max_pages / buffer_split)) { + (vnic->bufpages.max_pages / sfc_netfront_buffer_split)) { bufinfo = vnic->rx_bufs; } else bufinfo = vnic->tx_bufs; @@ -286,7 +286,7 @@ static int vnic_process_hello_msg(netfro struct net_accel_msg *msg) { int err = 0; - unsigned pages = max_pages; + unsigned pages = sfc_netfront_max_pages; if (vnic_check_hello_version(msg->u.hello.version) < 0) { msg->id = NET_ACCEL_MSG_HELLO | NET_ACCEL_MSG_REPLY diff -r b851951738f4 drivers/xen/sfc_netfront/accel_netfront.c --- a/drivers/xen/sfc_netfront/accel_netfront.c +++ b/drivers/xen/sfc_netfront/accel_netfront.c @@ -234,13 +234,14 @@ struct netfront_accel_hooks accel_hooks }; -unsigned max_pages = NETFRONT_ACCEL_DEFAULT_BUF_PAGES; -module_param (max_pages, int, 0666); +unsigned sfc_netfront_max_pages = NETFRONT_ACCEL_DEFAULT_BUF_PAGES; +module_param_named (max_pages, sfc_netfront_max_pages, uint, 0666); MODULE_PARM_DESC(max_pages, "Number of buffer pages to request"); -unsigned buffer_split = 2; -module_param (buffer_split, int, 0666); -MODULE_PARM_DESC(buffer_split, "Fraction of buffers to use for TX, rest for RX"); +unsigned sfc_netfront_buffer_split = 2; +module_param_named (buffer_split, sfc_netfront_buffer_split, uint, 0666); +MODULE_PARM_DESC(buffer_split, + "Fraction of buffers to use for TX, rest for RX"); const char *frontend_name = "sfc_netfront";