diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
| commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
| tree | cd71e597bbbe677820bb229c6aedbad412758959 /drivers/net/ethernet/ibm/iseries_veth.c | |
| parent | d6f03f29f7cdf064289f941bf0b838348e996e65 (diff) | |
| parent | fc0b927d9a5024e138c4318fe19a590f23e3eeec (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'drivers/net/ethernet/ibm/iseries_veth.c')
| -rw-r--r-- | drivers/net/ethernet/ibm/iseries_veth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/iseries_veth.c b/drivers/net/ethernet/ibm/iseries_veth.c index 4326681df382..acc31af6594a 100644 --- a/drivers/net/ethernet/ibm/iseries_veth.c +++ b/drivers/net/ethernet/ibm/iseries_veth.c | |||
| @@ -1421,7 +1421,7 @@ static void veth_receive(struct veth_lpar_connection *cnx, | |||
| 1421 | 1421 | ||
| 1422 | /* FIXME: do we need this? */ | 1422 | /* FIXME: do we need this? */ |
| 1423 | memset(local_list, 0, sizeof(local_list)); | 1423 | memset(local_list, 0, sizeof(local_list)); |
| 1424 | memset(remote_list, 0, sizeof(VETH_MAX_FRAMES_PER_MSG)); | 1424 | memset(remote_list, 0, sizeof(remote_list)); |
| 1425 | 1425 | ||
| 1426 | /* a 0 address marks the end of the valid entries */ | 1426 | /* a 0 address marks the end of the valid entries */ |
| 1427 | if (senddata->addr[startchunk] == 0) | 1427 | if (senddata->addr[startchunk] == 0) |