Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8266f5fc authored by David L Stevens's avatar David L Stevens Committed by David S. Miller
Browse files

sunvnet: only use connected ports when sending 



The sunvnet driver doesn't check whether or not a port is connected when
transmitting packets, which results in failures if a port fails to connect
(e.g., due to a version mismatch). The original code also assumes
unnecessarily that the first port is up and a switch, even though there is
a flag for switch ports.

This patch only matches a port if it is connected, and otherwise uses the
switch_port flag to send the packet to a switch port that is up.

Signed-off-by: default avatarDavid L Stevens <david.stevens@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8356f976

drivers/net/ethernet/sun/sunvnet.c

+17 −5
Original line number Diff line number Diff line
@@ -610,6 +610,13 @@ static int __vnet_tx_trigger(struct vnet_port *port) 
	return err;

}



static inline bool port_is_up(struct vnet_port *vnet)

{

	struct vio_driver_state *vio = &vnet->vio;



	return !!(vio->hs_state & VIO_HS_COMPLETE);

}



struct vnet_port *__tx_port_find(struct vnet *vp, struct sk_buff *skb)

{

	unsigned int hash = vnet_hashfn(skb->data);
@@ -617,15 +624,20 @@ struct vnet_port *__tx_port_find(struct vnet *vp, struct sk_buff *skb) 
	struct vnet_port *port;



	hlist_for_each_entry(port, hp, hash) {

		if (!port_is_up(port))

			continue;

		if (ether_addr_equal(port->raddr, skb->data))

			return port;

	}

	port = NULL;

	if (!list_empty(&vp->port_list))

		port = list_entry(vp->port_list.next, struct vnet_port, list);



	list_for_each_entry(port, &vp->port_list, list) {

		if (!port->switch_port)

			continue;

		if (!port_is_up(port))

			continue;

		return port;

	}

	return NULL;

}



struct vnet_port *tx_port_find(struct vnet *vp, struct sk_buff *skb)

{