Skip to content

Commit baf917c

Browse files
virtionet: Replaced Eth addr with MAC_addr
1 parent 0769915 commit baf917c

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/drivers/virtionet.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ using namespace net;
3737
constexpr VirtioNet::virtio_net_hdr VirtioNet::empty_header;
3838

3939
const char* VirtioNet::name() const { return "VirtioNet Driver"; }
40-
const net::Ethernet::addr& VirtioNet::mac(){ return _conf.mac; }
4140

4241
void VirtioNet::get_config() {
4342
Virtio::get_config(&_conf, _config_length);

src/drivers/virtionet.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ class VirtioNet : Virtio, public hw::Nic {
122122
const char* name() const override;
123123

124124
/** Mac address. */
125-
const net::Ethernet::addr& mac() override;
125+
const hw::MAC_addr& mac() override
126+
{ return _conf.mac; }
126127

127128
uint16_t MTU() const noexcept override
128129
{ return 1500; }
@@ -192,7 +193,7 @@ class VirtioNet : Virtio, public hw::Nic {
192193

193194
// From Virtio 1.01, 5.1.4
194195
struct config{
195-
net::Ethernet::addr mac;
196+
hw::MAC_addr mac;
196197
uint16_t status;
197198

198199
//Only valid if VIRTIO_NET_F_MQ

0 commit comments

Comments
 (0)