summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJianjun Kong <kongjianjun@gmail.com>2013-01-18 16:52:09 +0000
committerDavid S. Miller <davem@davemloft.net>2013-01-19 11:01:23 -0500
commit9a4c831ebbc1bf7cb41079e421a74bddd508f251 (patch)
treeae607eef598dee03bfc31ce830106f83b8145789
parentc1acd7090f67471998edd1d036003fcba2c1b419 (diff)
downloadlinux-3.10-9a4c831ebbc1bf7cb41079e421a74bddd508f251.tar.gz
linux-3.10-9a4c831ebbc1bf7cb41079e421a74bddd508f251.tar.bz2
linux-3.10-9a4c831ebbc1bf7cb41079e421a74bddd508f251.zip
net/hyperv: fix wrong length of mac address
This patch fixed wrong mac length, it should be ETH_ALEN, also replaced the hardcode 6 in hyperv_net.h Signed-off-by: Amos Kong <kongjianjun@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/hyperv/hyperv_net.h2
-rw-r--r--drivers/net/hyperv/netvsc_drv.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 5fd6f467432..e6fe0d80d61 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -84,7 +84,7 @@ struct hv_netvsc_packet {
};
struct netvsc_device_info {
- unsigned char mac_adr[6];
+ unsigned char mac_adr[ETH_ALEN];
bool link_state; /* 0 - link up, 1 - link down */
int ring_size;
};
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index f825a629a69..8264f0ef769 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -349,7 +349,7 @@ static int netvsc_set_mac_addr(struct net_device *ndev, void *p)
struct net_device_context *ndevctx = netdev_priv(ndev);
struct hv_device *hdev = ndevctx->device_ctx;
struct sockaddr *addr = p;
- char save_adr[14];
+ char save_adr[ETH_ALEN];
unsigned char save_aatype;
int err;