[Qemu-devel] [PATCH 0/3] hw/net: Drop unnecessary .can_receive functions

[Qemu-devel] [PATCH 0/3] hw/net: Drop unnecessary .can_receive functions

[Fam Zheng]

These are all repeating the default, and since we're cleaning up .can_receive,
let's get these out of the way.

Fam


Fam Zheng (3):
  musicpal: Drop eth_can_receive
  etraxfs_eth: Drop eth_can_receive
  lan9118: Drop lan9118_can_receive

 hw/arm/musicpal.c    | 6 ------
 hw/net/etraxfs_eth.c | 6 ------
 hw/net/lan9118.c     | 6 ------
 3 files changed, 18 deletions(-)

-- 
2.4.3

[Qemu-devel] [PATCH 1/3] musicpal: Drop eth_can_receive

[Fam Zheng]

True is the default.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 hw/arm/musicpal.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index a3b1314..42f66b3 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -187,11 +187,6 @@ static void eth_rx_desc_get(uint32_t addr, mv88w8618_rx_desc *desc)
     le32_to_cpus(&desc->next);
 }
 
-static int eth_can_receive(NetClientState *nc)
-{
-    return 1;
-}
-
 static ssize_t eth_receive(NetClientState *nc, const uint8_t *buf, size_t size)
 {
     mv88w8618_eth_state *s = qemu_get_nic_opaque(nc);
@@ -381,7 +376,6 @@ static void eth_cleanup(NetClientState *nc)
 static NetClientInfo net_mv88w8618_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
-    .can_receive = eth_can_receive,
     .receive = eth_receive,
     .cleanup = eth_cleanup,
 };
-- 
2.4.3

[Qemu-devel] [PATCH 2/3] etraxfs_eth: Drop eth_can_receive

[Fam Zheng]

True is the default.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 hw/net/etraxfs_eth.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c
index 4773dea..d600275 100644
--- a/hw/net/etraxfs_eth.c
+++ b/hw/net/etraxfs_eth.c
@@ -520,11 +520,6 @@ static int eth_match_groupaddr(ETRAXFSEthState *eth, const unsigned char *sa)
     return match;
 }
 
-static int eth_can_receive(NetClientState *nc)
-{
-    return 1;
-}
-
 static ssize_t eth_receive(NetClientState *nc, const uint8_t *buf, size_t size)
 {
     unsigned char sa_bcast[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
@@ -584,7 +579,6 @@ static const MemoryRegionOps eth_ops = {
 static NetClientInfo net_etraxfs_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
-    .can_receive = eth_can_receive,
     .receive = eth_receive,
     .link_status_changed = eth_set_link,
 };
-- 
2.4.3

[Qemu-devel] [PATCH 3/3] lan9118: Drop lan9118_can_receive

[Fam Zheng]

True is the default.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 hw/net/lan9118.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index f169c38..4f0e840 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -461,11 +461,6 @@ static void lan9118_reset(DeviceState *d)
     lan9118_reload_eeprom(s);
 }
 
-static int lan9118_can_receive(NetClientState *nc)
-{
-    return 1;
-}
-
 static void rx_fifo_push(lan9118_state *s, uint32_t val)
 {
     int fifo_pos;
@@ -1312,7 +1307,6 @@ static const MemoryRegionOps lan9118_16bit_mem_ops = {
 static NetClientInfo net_lan9118_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
-    .can_receive = lan9118_can_receive,
     .receive = lan9118_receive,
     .link_status_changed = lan9118_set_link,
 };
-- 
2.4.3

Re: [Qemu-devel] [PATCH 0/3] hw/net: Drop unnecessary .can_receive functions

[Fam Zheng]

On Wed, 07/01 15:10, Fam Zheng wrote:
> These are all repeating the default, and since we're cleaning up .can_receive,
> let's get these out of the way.

Cc'ing net maintainers.

Fam

Re: [Qemu-devel] [PATCH 0/3] hw/net: Drop unnecessary .can_receive functions

[Jason Wang]

On 07/01/2015 03:10 PM, Fam Zheng wrote:
> These are all repeating the default, and since we're cleaning up .can_receive,
> let's get these out of the way.
>
> Fam
>
>
> Fam Zheng (3):
>   musicpal: Drop eth_can_receive
>   etraxfs_eth: Drop eth_can_receive
>   lan9118: Drop lan9118_can_receive
>
>  hw/arm/musicpal.c    | 6 ------
>  hw/net/etraxfs_eth.c | 6 ------
>  hw/net/lan9118.c     | 6 ------
>  3 files changed, 18 deletions(-)
>

Reviewed-by: Jason Wang <jasowang@redhat.com>

Re: [Qemu-devel] [PATCH 0/3] hw/net: Drop unnecessary .can_receive functions

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 596 bytes --]

On Wed, Jul 01, 2015 at 03:10:44PM +0800, Fam Zheng wrote:
> These are all repeating the default, and since we're cleaning up .can_receive,
> let's get these out of the way.
> 
> Fam
> 
> 
> Fam Zheng (3):
>   musicpal: Drop eth_can_receive
>   etraxfs_eth: Drop eth_can_receive
>   lan9118: Drop lan9118_can_receive
> 
>  hw/arm/musicpal.c    | 6 ------
>  hw/net/etraxfs_eth.c | 6 ------
>  hw/net/lan9118.c     | 6 ------
>  3 files changed, 18 deletions(-)
> 
> -- 
> 2.4.3
> 
> 

Thanks, applied to my net tree:
https://github.com/stefanha/qemu/commits/net

Stefan

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]