dm: eth: Pass the packet pointer as a parameter to recv

Stop forcing drivers to call net_process_received_packet() - formerly
called NetReceive(). Now the uclass will handle calling the driver for
each packet until the driver errors or has nothing to return. The uclass
will then pass the good packets off to the network stack by calling
net_process_received_packet().

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/include/net.h b/include/net.h
index a536fcc0617432675f326c144c98a3abd9f7816b..0a1b3a827ced5053e23fae98f74727392c21d95c 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -95,7 +95,9 @@ struct eth_pdata {
  *
  * start: Prepare the hardware to send and receive packets
  * send: Send the bytes passed in "packet" as a packet on the wire
- * recv: Check if the hardware received a packet. Call the network stack if so
+ * recv: Check if the hardware received a packet. If so, set the pointer to the
+ *      packet buffer in the packetp parameter. If not, return an error or 0 to
+ *      indicate that the hardware receive FIFO is empty
  * stop: Stop the hardware from looking for packets - may be called even if
  *      state == PASSIVE
  * mcast: Join or leave a multicast group (for TFTP) - optional
@@ -110,7 +112,7 @@ struct eth_pdata {
 struct eth_ops {
        int (*start)(struct udevice *dev);
        int (*send)(struct udevice *dev, void *packet, int length);
-       int (*recv)(struct udevice *dev);
+       int (*recv)(struct udevice *dev, uchar **packetp);
        void (*stop)(struct udevice *dev);
 #ifdef CONFIG_MCAST_TFTP
        int (*mcast)(struct udevice *dev, const u8 *enetaddr, int join);

diff --git a/net/eth.c b/net/eth.c
index 1abf0274b489d98b79ef94885682fab0f18095e6..058c55a0e6e6ca0885040b957170958abb44e6f7 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -259,6 +259,9 @@ int eth_send(void *packet, int length)
 int eth_rx(void)
 {
        struct udevice *current;
+       uchar *packet;
+       int ret;
+       int i;
 
        current = eth_get_dev();
        if (!current)
@@ -267,7 +270,17 @@ int eth_rx(void)
        if (!device_active(current))
                return -EINVAL;
 
-       return eth_get_ops(current)->recv(current);
+       /* Process up to 32 packets at one time */
+       for (i = 0; i < 32; i++) {
+               ret = eth_get_ops(current)->recv(current, &packet);
+               if (ret > 0)
+                       net_process_received_packet(packet, ret);
+               else
+                       break;
+       }
+       if (ret == -EAGAIN)
+               ret = 0;
+       return ret;
 }
 
 static int eth_write_hwaddr(struct udevice *dev)