[mcs814x] nuport-mac: various fixes

[openwrt/svn-archive/archive.git] / target / linux / mcs814x / files-3.3 / drivers / net / ethernet / mcs8140 / nuport_mac.c

diff --git a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
index fe95ea7f7d947557cc9bc27d4b585fa3c1697ee6..2dc23751598d629ec79e94c2bd0960fa0082e409 100644 (file)
--- a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
+++ b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
@@ -396,7 +396,7 @@ static void nuport_mac_adjust_link(struct net_device *dev)
                priv->old_link = phydev->link;
        }
 
-       if (phydev->link & (priv->old_duplex != phydev->duplex)) {
+       if (phydev->link && (priv->old_duplex != phydev->duplex)) {
                reg = nuport_mac_readl(CTRL_REG);
                if (phydev->duplex == DUPLEX_FULL)
                        reg |= DUPLEX_FULL;
@@ -564,7 +564,6 @@ static int nuport_mac_rx(struct net_device *dev, int limit)
 
                /* Get packet status */
                status = get_unaligned((u32 *) (skb->data + len));
-               skb->dev = dev;
 
                dma_unmap_single(&priv->pdev->dev, priv->rx_addr, skb->len,
                                DMA_FROM_DEVICE);
@@ -615,6 +614,9 @@ static int nuport_mac_rx(struct net_device *dev, int limit)
 
 exit:
                skb = netdev_alloc_skb(dev, RX_ALLOC_SIZE);
+               if (!skb)
+                       goto out;
+
                skb_reserve(skb, RX_SKB_HEADROOM);
                priv->rx_skb[priv->cur_rx] = skb;
                priv->irq_rxskb[priv->cur_rx] = 1;
@@ -624,7 +626,7 @@ exit:
                        priv->cur_rx = 0;
                count++;
        }
-
+out:
        return count;
 }