diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 18:53:01 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 18:53:01 +0100 |
| commit | 168268a225d24da3768a88c1029fb3014b0837ca (patch) | |
| tree | afde019a1ac79366df0b96a2fcc8ba50bc5298fa /drivers/net/hyperv/hyperv_net.h | |
| parent | 04ee16bdf486061147c608410c2c9181352aaa3a (diff) | |
| parent | 6f1989bc982bc176b0d63e028e9b7f23ae1b4583 (diff) | |
Merge 'mmc/upstream' into late/mvebu2
These patches from the mmc tree were merged into v3.9 already
and the later mvebu patches depend on them.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net/hyperv/hyperv_net.h')
| -rw-r--r-- | drivers/net/hyperv/hyperv_net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 5fd6f4674326..e6fe0d80d612 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; }; |