Commit 42c1246d authored by Vikram Narayanan's avatar Vikram Narayanan

lcd/test_mods: Pacify compiler

parent fb20760e
......@@ -1462,7 +1462,7 @@ void napi_consume_skb(struct sk_buff *skb, int budget)
{
int ret;
struct fipc_message *_request;
struct sk_buff_container *skb_c;
struct sk_buff_container *skb_c = NULL;
#ifndef NAPI_CONSUME_SEND_ONLY
struct fipc_message *_response;
#endif
......@@ -1525,7 +1525,7 @@ void consume_skb(struct sk_buff *skb)
struct fipc_message *_response;
unsigned long skb_sz, skb_off, skbh_sz, skbh_off;
cptr_t skb_cptr, skbh_cptr;
struct sk_buff_container *skb_c;
struct sk_buff_container *skb_c = NULL;
ret = async_msg_blocking_send_start(ixgbe_async,
&_request);
......@@ -2209,7 +2209,7 @@ int pci_enable_device_mem(struct pci_dev *dev)
int ret;
struct fipc_message *_request;
struct fipc_message *_response;
int func_ret;
int func_ret = 0;
ret = async_msg_blocking_send_start(ixgbe_async,
&_request);
if (ret) {
......@@ -2401,7 +2401,7 @@ int pci_select_bars(struct pci_dev *dev,
int ret;
struct fipc_message *_request;
struct fipc_message *_response;
int func_ret;
int func_ret = 0;
ret = async_msg_blocking_send_start(ixgbe_async,
&_request);
if (ret) {
......@@ -2435,7 +2435,7 @@ int pci_wake_from_d3(struct pci_dev *dev,
int ret;
struct fipc_message *_request;
struct fipc_message *_response;
int func_ret;
int func_ret = 0;
ret = async_msg_blocking_send_start(ixgbe_async,
&_request);
if (ret) {
......@@ -2471,7 +2471,7 @@ int ndo_open_callee(struct fipc_message *_request,
int ret;
struct fipc_message *_response;
unsigned int request_cookie;
int func_ret;
int func_ret = 0;
request_cookie = thc_get_request_cookie(_request);
ret = glue_cap_lookup_net_device_type(cspace,
__cptr(fipc_get_reg1(_request)),
......@@ -2760,9 +2760,9 @@ int ndo_start_xmit_callee(struct fipc_message *_request,
struct glue_cspace *cspace,
struct cptr sync_ep)
{
struct sk_buff *skb;
struct sk_buff_container *skb_c;
int ret;
struct sk_buff *skb = NULL;
struct sk_buff_container *skb_c = NULL;
int ret = 0;
struct fipc_message *_response;
unsigned int request_cookie;
int func_ret;
......@@ -3303,7 +3303,7 @@ int __hw_addr_sync_dev(
int ( *unsync )(struct net_device *, const unsigned char*))
{
struct net_device_container *dev1_container;
int ret;
int ret = 0;
struct fipc_message *_request;
struct fipc_message *_response;
int func_ret;
......@@ -3703,7 +3703,7 @@ int netif_receive_skb(struct sk_buff *skb)
struct fipc_message *_request;
struct fipc_message *_response;
int func_ret;
struct sk_buff_container *skb_c;
struct sk_buff_container *skb_c = NULL;
ret = async_msg_blocking_send_start(ixgbe_async,
&_request);
if (ret) {
......@@ -3956,7 +3956,7 @@ gro_result_t napi_gro_receive(struct napi_struct *napi,
#ifndef NAPI_RX_SEND_ONLY
struct fipc_message *_response;
#endif
int func_ret;
int func_ret = 0;
struct skb_shared_info *shinfo;
struct page *p = NULL;
u64 hash;
......
......@@ -3073,7 +3073,7 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
{
struct net_device *netdev = adapter->netdev;
int vector, err;
int ri = 0, ti = 0;
unsigned char ri = 0, ti = 0;
for (vector = 0; vector < adapter->num_q_vectors; vector++) {
struct ixgbe_q_vector *q_vector = adapter->q_vector[vector];
......@@ -3081,7 +3081,7 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
if (q_vector->tx.ring && q_vector->rx.ring) {
snprintf(q_vector->name, sizeof(q_vector->name) - 1,
"%s-%s-%d", netdev->name, "TxRx", ri++);
"%s-%s-%d", netdev->name, "TxRx", ri++ & 0xf);
ti++;
} else if (q_vector->rx.ring) {
snprintf(q_vector->name, sizeof(q_vector->name) - 1,
......
......@@ -95,6 +95,8 @@ struct {
bool valid;
} pools[MAX_POOLS] = { {0} };
int ndo_start_xmit_async_landing(struct sk_buff *first, struct net_device *dev, struct trampoline_hidden_args *hidden_args);
int compare_addr(const void *a, const void *b)
{
return *(unsigned int *)a - *(unsigned int *)b;
......@@ -583,8 +585,8 @@ int __pci_register_driver_callee(struct fipc_message *_request,
unsigned int request_cookie;
struct trampoline_hidden_args *drv_probe_hidden_args;
struct trampoline_hidden_args *drv_remove_hidden_args;
int func_ret;
int ret;
int func_ret = 0;
int ret = 0;
request_cookie = thc_get_request_cookie(_request);
drv_container = kzalloc(sizeof( struct pci_driver_container ),
......@@ -805,7 +807,7 @@ int probe(struct pci_dev *dev,
struct trampoline_hidden_args *hidden_args)
{
struct pci_dev_container *dev_container;
int ret;
int ret = 0;
struct fipc_message *_request;
struct fipc_message *_response;
int func_ret;
......@@ -1470,7 +1472,7 @@ int ndo_start_xmit_nonlcd(struct sk_buff *skb,
int ret;
struct fipc_message *_request;
struct fipc_message *_response;
int func_ret;
int func_ret = 0;
unsigned int request_cookie;
cptr_t sync_end;
struct sk_buff_container *skb_c;
......@@ -1821,13 +1823,13 @@ int ndo_start_xmit(struct sk_buff *skb,
struct trampoline_hidden_args *hidden_args)
{
struct net_device_container *dev_container;
int ret;
int ret = 0;
struct fipc_message *_request;
struct fipc_message *_response;
unsigned int request_cookie;
int func_ret;
int func_ret = 0;
struct sk_buff_container *skb_c;
unsigned long skb_ord, skb_off;
unsigned long skb_ord = 0, skb_off;
unsigned long skbd_ord, skbd_off;
cptr_t skb_cptr, skbd_cptr;
xmit_type_t xmit_type;
......@@ -5759,7 +5761,7 @@ int napi_gro_receive_callee(struct fipc_message *_request,
int func_ret;
unsigned long page = 0ul;
struct lcd *lcd_struct;
hva_t hva_out;
hva_t hva_out = {0};
struct skb_shared_info *shinfo;
struct page *p = NULL;
unsigned int old_pcount;
......@@ -5918,7 +5920,7 @@ int __napi_alloc_skb_callee(struct fipc_message *_request,
struct napi_struct *napi;
unsigned int len;
gfp_t gfp_mask;
int ret;
int ret = 0;
struct sk_buff *skb;
struct sk_buff_container *skb_c;
struct fipc_message *_response;
......@@ -6150,7 +6152,7 @@ int eth_get_headlen_callee(struct fipc_message *_request,
int ret = 0;
struct fipc_message *_response;
unsigned int request_cookie;
unsigned int func_ret;
unsigned int func_ret = 0;
struct lcd *lcd_struct;
hva_t hva_out;
......
......@@ -1597,7 +1597,7 @@ int validate_callee(struct fipc_message *request, struct thc_channel *channel, s
struct nlattr **data;
struct fipc_message *response;
unsigned int request_cookie;
int ret;
int ret = 0;
request_cookie = thc_get_request_cookie(request);
fipc_recv_msg_end(thc_channel_to_fipc(channel), request);
tb = kzalloc(sizeof( void * ), GFP_KERNEL);
......
......@@ -17,6 +17,7 @@
#include "../../ipc_helper.h"
#include <linux/sort.h>
#include <linux/priv_mempool.h>
#include <lcd_config/post_hook.h>
......@@ -2119,7 +2120,7 @@ int __rtnl_link_register_callee(void)
cptr_t tx_xmit, rx_xmit;
struct thc_channel *chnl;
cptr_t sync_endpoint;
int ret;
int ret = 0;
struct trampoline_hidden_args *validate_hidden_args;
struct trampoline_hidden_args *setup_hidden_args;
int err;
......@@ -2431,7 +2432,7 @@ fail_cptr:
int alloc_netdev_mqs_callee(struct fipc_message *request, struct thc_channel *channel, struct glue_cspace *cspace, struct cptr sync_ep)
{
int sizeof_priv;
int ret;
int ret = 0;
char *name;
char name_assign_type;
struct setup_container *temp;
......
......@@ -116,7 +116,7 @@ int sender_dispatch(struct thc_channel *chnl, struct fipc_message *out, void *ar
int __ndo_start_xmit_inner_async(struct sk_buff *skb, struct net_device *dev, struct trampoline_hidden_args *hidden_args)
{
int ret;
int ret = 0;
struct fipc_message *_request;
struct fipc_message *_response;
#ifdef COPY
......@@ -346,7 +346,7 @@ int ndo_start_xmit_noasync(struct sk_buff *skb, struct net_device *dev, struct t
xmit_type_t xmit_type;
struct thc_channel *async_chnl;
struct net_device_container *net_dev_container;
struct sk_buff_container static_skbc;
struct sk_buff_container static_skbc = {0};
struct sk_buff_container *skb_c = &static_skbc;
int ret;
......@@ -442,7 +442,7 @@ free:
*/
int ndo_start_xmit_async(struct sk_buff *skb, struct net_device *dev, struct trampoline_hidden_args *hidden_args)
{
int ret;
int ret = 0;
struct fipc_message *_request;
struct fipc_message *_response;
struct net_device_container *net_dev_container;
......@@ -451,7 +451,7 @@ int ndo_start_xmit_async(struct sk_buff *skb, struct net_device *dev, struct tra
struct skbuff_members *skb_lcd;
#endif
unsigned int request_cookie;
struct sk_buff_container static_skbc;
struct sk_buff_container static_skbc = {0};
struct sk_buff_container *skb_c = &static_skbc;
struct thc_channel *async_chnl = NULL;
......
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