Message type for DL_GETSTAT_S

Change-Id: Ia5c2bf7a3d796a6a0463af70059e82fddd43d69c

diff --git a/drivers/atl2/atl2.c b/drivers/atl2/atl2.c
index b8fc1bf097b87df9e84d232fa5242f6979f5c965..4faeecb05599239369e9527f49139164203e045d 100644 (file)
--- a/drivers/atl2/atl2.c
+++ b/drivers/atl2/atl2.c
@@ -1056,7 +1056,7 @@ static void atl2_getstat(message *m)
         */
        int r;
 
-       sys_safecopyto(m->m_source, m->DL_GRANT, 0,
+       sys_safecopyto(m->m_source, m->m_net_netdrv_dl_getstat_s.grant, 0,
                (vir_bytes) &state.stat, sizeof(state.stat));
 
        m->m_type = DL_STAT_REPLY;

diff --git a/drivers/dec21140A/dec21140A.c b/drivers/dec21140A/dec21140A.c
index 35514e3b3dbbd3cb3458f634e00a7b81df4c181a..e538fb27efe0b07fe9ee505f7acceae521878090 100644 (file)
--- a/drivers/dec21140A/dec21140A.c
+++ b/drivers/dec21140A/dec21140A.c
@@ -176,9 +176,8 @@ static void do_get_stat_s(message * mp)
 
   dep = &de_state;
 
-  if ((rc = sys_safecopyto(mp->m_source, mp->DL_GRANT, 0UL,
-                       (vir_bytes)&dep->de_stat,
-                       sizeof(dep->de_stat))) != OK)
+  if ((rc = sys_safecopyto(mp->m_source, mp->m_net_netdrv_dl_getstat_s.grant,
+                 0, (vir_bytes)&dep->de_stat, sizeof(dep->de_stat))) != OK)
         panic("%s %d", str_CopyErrMsg, rc);
 
   mp->m_type = DL_STAT_REPLY;

diff --git a/drivers/dp8390/dp8390.c b/drivers/dp8390/dp8390.c
index cfd50a84678d6b31c6a9b3277cb975c87a4aa586..c0abc61be0ef59c8dda89533c507966531f272f1 100644 (file)
--- a/drivers/dp8390/dp8390.c
+++ b/drivers/dp8390/dp8390.c
@@ -582,7 +582,8 @@ message *mp;
 
        if (dep->de_mode == DEM_SINK)
        {
-               put_userdata_s(mp->m_source, (vir_bytes) mp->DL_GRANT,
+               put_userdata_s(mp->m_source,
+                       mp->m_net_netdrv_dl_getstat_s.grant,
                        (vir_bytes) sizeof(dep->de_stat), &dep->de_stat);
 
                mp->m_type= DL_STAT_REPLY;
@@ -598,7 +599,7 @@ message *mp;
        dep->de_stat.ets_frameAll += inb_reg0(dep, DP_CNTR1);
        dep->de_stat.ets_missedP += inb_reg0(dep, DP_CNTR2);
 
-       put_userdata_s(mp->m_source, mp->DL_GRANT,
+       put_userdata_s(mp->m_source, mp->m_net_netdrv_dl_getstat_s.grant,
                sizeof(dep->de_stat), &dep->de_stat);
 
        mp->m_type= DL_STAT_REPLY;

diff --git a/drivers/dpeth/dp.c b/drivers/dpeth/dp.c
index 7c0edbc737f3b8d7f5f72dbf849ab4b13bac7a79..972845d55faad4e85fe6608808b935c36f045711 100644 (file)
--- a/drivers/dpeth/dp.c
+++ b/drivers/dpeth/dp.c
@@ -434,9 +434,9 @@ static void do_getstat_s(const message * mp)
   dep = &de_state;
 
   if (dep->de_mode == DEM_ENABLED) (*dep->de_getstatsf) (dep);
-  if ((rc = sys_safecopyto(mp->m_source, mp->DL_GRANT, 0,
+  if ((rc = sys_safecopyto(mp->m_source, mp->m_net_netdrv_dl_getstat_s.grant, 0,
                        (vir_bytes)&dep->de_stat,
-                       (vir_bytes) sizeof(dep->de_stat))) != OK)
+                       (vir_bytes)sizeof(dep->de_stat))) != OK)
         panic(CopyErrMsg, rc);
 
   reply_mess.m_type = DL_STAT_REPLY;

diff --git a/drivers/e1000/e1000.c b/drivers/e1000/e1000.c
index 0b1449d99d620c798c5c542a0a47092f69440c0a..45af30bfe17aab6eeee6db559270f6a03217d59f 100644 (file)
--- a/drivers/e1000/e1000.c
+++ b/drivers/e1000/e1000.c
@@ -791,8 +791,8 @@ message *mp;
     stats.ets_CDheartbeat = 0;
     stats.ets_OWC = 0;
 
-    sys_safecopyto(mp->m_source, mp->DL_GRANT, 0, (vir_bytes)&stats,
-                   sizeof(stats));
+    sys_safecopyto(mp->m_source, mp->m_net_netdrv_dl_getstat_s.grant, 0,
+           (vir_bytes)&stats, sizeof(stats));
     mp->m_type  = DL_STAT_REPLY;
     if((r=ipc_send(mp->m_source, mp)) != OK)
        panic("e1000_getstat: ipc_send() failed: %d", r);

diff --git a/drivers/fxp/fxp.c b/drivers/fxp/fxp.c
index d53c27f489d9cd68e946039f33d4dc5848602317..61496eaa5d2cb1b4b6a328df9edbc132934656a2 100644 (file)
--- a/drivers/fxp/fxp.c
+++ b/drivers/fxp/fxp.c
@@ -1429,8 +1429,8 @@ static void fxp_getstat_s(message *mp)
        stats.ets_CDheartbeat= 0;
        stats.ets_OWC= fp->fxp_stat.sc_tx_latecol;
 
-       r= sys_safecopyto(mp->m_source, mp->DL_GRANT, 0, (vir_bytes)&stats,
-               sizeof(stats));
+       r= sys_safecopyto(mp->m_source, mp->m_net_netdrv_dl_getstat_s.grant, 0,
+               (vir_bytes)&stats, sizeof(stats));
        if (r != OK)
                panic("fxp_getstat_s: sys_safecopyto failed: %d", r);
 

diff --git a/drivers/lan8710a/lan8710a.c b/drivers/lan8710a/lan8710a.c
index 4f6452dce4e9bd6adb25a0c8fb98c9f74c9fb0d2..77fd1983d1eefe2a5f94136f8cece6832761cf57 100644 (file)
--- a/drivers/lan8710a/lan8710a.c
+++ b/drivers/lan8710a/lan8710a.c
@@ -438,8 +438,8 @@ message *mp;
        stats.ets_CDheartbeat = 0;
        stats.ets_OWC = 0;
 
-       sys_safecopyto(mp->m_source, mp->DL_GRANT, 0, (vir_bytes)&stats,
-                       sizeof(stats));
+       sys_safecopyto(mp->m_source, mp->m_net_netdrv_dl_getstat_s.grant, 0,
+               (vir_bytes)&stats, sizeof(stats));
        mp->m_type  = DL_STAT_REPLY;
 
        if ((r=ipc_send(mp->m_source, mp)) != OK) {

diff --git a/drivers/lance/lance.c b/drivers/lance/lance.c
index 0d2017de5d3d10c565c5975f01876d66914b127b..a7adcf3f8a252a8c81e3f134e1b780fac9c77060 100644 (file)
--- a/drivers/lance/lance.c
+++ b/drivers/lance/lance.c
@@ -1311,7 +1311,7 @@ message *mp;
 
    ec= &ec_state;
 
-   r = sys_safecopyto(mp->m_source, mp->DL_GRANT, 0,
+   r = sys_safecopyto(mp->m_source, mp->m_net_netdrv_dl_getstat_s.grant, 0,
                       (vir_bytes)&ec->eth_stat, sizeof(ec->eth_stat));
 
    if (r != OK)

diff --git a/drivers/orinoco/orinoco.c b/drivers/orinoco/orinoco.c
index 234320147a63e27d8138767faf10c0258ba75d22..96bbc30295ee60559a237e2c55167aebf74f58f5 100644 (file)
--- a/drivers/orinoco/orinoco.c
+++ b/drivers/orinoco/orinoco.c
@@ -1780,8 +1780,8 @@ static void or_getstat_s (message * mp) {
 
        stats = orp->or_stat;
 
-       r = sys_safecopyto(mp->m_source, mp->DL_GRANT, 0, 
-                               (vir_bytes) &stats, sizeof(stats));
+       r = sys_safecopyto(mp->m_source, mp->m_net_netdrv_dl_getstat_s.grant,
+               0, (vir_bytes) &stats, sizeof(stats));
        if(r != OK) {
                panic("or_getstat_s: sys_safecopyto failed: %d", r);
        }

diff --git a/drivers/rtl8139/rtl8139.c b/drivers/rtl8139/rtl8139.c
index 09b33fe2b5dc0a30e9deb160e037f2fd7be35a09..a1b2ac13feb66444d7b422026f89ac964f33ae3c 100644 (file)
--- a/drivers/rtl8139/rtl8139.c
+++ b/drivers/rtl8139/rtl8139.c
@@ -1532,8 +1532,8 @@ message *mp;
 
        stats= rep->re_stat;
 
-       r = sys_safecopyto(mp->m_source, mp->DL_GRANT, 0,
-               (vir_bytes) &stats, sizeof(stats));
+       r = sys_safecopyto(mp->m_source, mp->m_net_netdrv_dl_getstat_s.grant,
+               0, (vir_bytes) &stats, sizeof(stats));
        if (r != OK)
                panic("rl_getstat_s: sys_safecopyto failed: %d", r);
 

diff --git a/drivers/rtl8169/rtl8169.c b/drivers/rtl8169/rtl8169.c
index f80cf77f603ca538079db011c3dfc84237ffda50..1d5617fd840365f997255bfa55826cc26609062a 100644 (file)
--- a/drivers/rtl8169/rtl8169.c
+++ b/drivers/rtl8169/rtl8169.c
@@ -1531,8 +1531,8 @@ message *mp;
 
        stats = rep->re_stat;
 
-       r = sys_safecopyto(mp->m_source, mp->DL_GRANT, 0,
-               (vir_bytes) &stats, sizeof(stats));
+       r = sys_safecopyto(mp->m_source, mp->m_net_netdrv_dl_getstat_s.grant,
+               0, (vir_bytes) &stats, sizeof(stats));
        if (r != OK)
                panic("rl_getstat_s: sys_safecopyto failed: %d", r);
 

diff --git a/drivers/virtio_net/virtio_net.c b/drivers/virtio_net/virtio_net.c
index fd6ac4d3c37170d2f11717c0c99cdd1b16f182e1..c25459a7c6c0ad84b9f0a0aaa8e2179e35808bdd 100644 (file)
--- a/drivers/virtio_net/virtio_net.c
+++ b/drivers/virtio_net/virtio_net.c
@@ -552,7 +552,7 @@ virtio_net_getstat(message *m)
        reply.DL_COUNT = 0;
 
 
-       r = sys_safecopyto(m->m_source, m->DL_GRANT, 0,
+       r = sys_safecopyto(m->m_source, m->m_net_netdrv_dl_getstat_s.grant, 0,
                           (vir_bytes)&virtio_net_stats,
                           sizeof(virtio_net_stats));
 

diff --git a/include/minix/ipc.h b/include/minix/ipc.h
index 051c7b7b2ceab8995be1a91d99d00ebe11f2e62e..eaab43f160a38017adc879318f47a791f227fd0a 100644 (file)
--- a/include/minix/ipc.h
+++ b/include/minix/ipc.h
@@ -828,6 +828,13 @@ typedef struct {
 } mess_netdrv_net_dl_conf;
 _ASSERT_MSG_SIZE(mess_netdrv_net_dl_conf);
 
+typedef struct {
+       cp_grant_id_t grant;
+
+       uint8_t padding[52];
+} mess_net_netdrv_dl_getstat_s;
+_ASSERT_MSG_SIZE(mess_net_netdrv_dl_getstat_s);
+
 typedef struct {
        uid_t egid;
 
@@ -1409,6 +1416,7 @@ typedef struct {
                mess_lsys_vfs_mapdriver m_lsys_vfs_mapdriver;
 
                mess_net_netdrv_dl_conf m_net_netdrv_dl_conf;
+               mess_net_netdrv_dl_getstat_s m_net_netdrv_dl_getstat_s;
 
                mess_netdrv_net_dl_conf m_netdrv_net_dl_conf;
 

diff --git a/servers/inet/mnx_eth.c b/servers/inet/mnx_eth.c
index 002e22fd1e9df3920c81ea1477e348b138a54d79..8580318a1c161c5b73de2fd0755fd8faa14ad0ca 100644 (file)
--- a/servers/inet/mnx_eth.c
+++ b/servers/inet/mnx_eth.c
@@ -832,7 +832,7 @@ eth_port_t *eth_port;
        message mess;
 
        mess.m_type= DL_GETSTAT_S;
-       mess.DL_GRANT= eth_port->etp_osdep.etp_stat_gid;
+       mess.m_net_netdrv_dl_getstat_s.grant= eth_port->etp_osdep.etp_stat_gid;
 
        assert(eth_port->etp_osdep.etp_state == OEPS_IDLE);