e1000: remove unnecessary clearing of SWSM.SWSM_SMBI

[karo-tx-uboot.git] / drivers / net / mpc5xxx_fec.c

diff --git a/drivers/net/mpc5xxx_fec.c b/drivers/net/mpc5xxx_fec.c
index d9d6f4f28b932ca0c8664867a3e7155c20d42af6..2ebd1761c3e7315fc904b152c709cc7657959a96 100644 (file)
--- a/drivers/net/mpc5xxx_fec.c
+++ b/drivers/net/mpc5xxx_fec.c
@@ -407,13 +407,8 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis)
         */
        if (fec->xcv_type == SEVENWIRE) {
                /*  10MBit with 7-wire operation */
-#if defined(CONFIG_TOTAL5200)
-               /* 7-wire and USB2 on Ethernet */
-               *(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= 0x00030000;
-#else  /* !CONFIG_TOTAL5200 */
                /* 7-wire only */
                *(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= 0x00020000;
-#endif /* CONFIG_TOTAL5200 */
        } else {
                /* 100MBit with MD operation */
                *(vu_long *)MPC5XXX_GPS_PORT_CONFIG |= 0x00050000;
@@ -864,7 +859,7 @@ static int mpc5xxx_fec_recv(struct eth_device *dev)
                         */
                        memcpy(buff, frame->head, 14);
                        memcpy(buff + 14, frame->data, frame_length);
-                       NetReceive(buff, frame_length);
+                       net_process_received_packet(buff, frame_length);
                        len = frame_length;
                }
                /*