Merge branch 'master' into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Sat, 1 Dec 2007 21:18:56 +0000 (16:18 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 1 Dec 2007 21:18:56 +0000 (16:18 -0500)
1  2 
drivers/net/bfin_mac.c

diff --combined drivers/net/bfin_mac.c
index f0f851693897182a5345c7cbd0219dfbbd94ad76,0b99b554929545cecf0abf93812873d7306518d4..eb971755a3ff34c5b8f76d5b8b63bf5f3a83aad0
@@@ -676,7 -676,7 +676,7 @@@ static void bf537mac_rx(struct net_devi
        skb->protocol = eth_type_trans(skb, dev);
  #if defined(BFIN_MAC_CSUM_OFFLOAD)
        skb->csum = current_rx_ptr->status.ip_payload_csum;
 -      skb->ip_summed = CHECKSUM_PARTIAL;
 +      skb->ip_summed = CHECKSUM_COMPLETE;
  #endif
  
        netif_rx(skb);
@@@ -924,7 -924,7 +924,7 @@@ static int __init bf537mac_probe(struc
        if (!is_valid_ether_addr(dev->dev_addr)) {
                /* Grab the MAC from the board somehow - this is done in the
                   arch/blackfin/mach-bf537/boards/eth_mac.c */
-               get_bf537_ether_addr(dev->dev_addr);
+               bfin_get_ether_addr(dev->dev_addr);
        }
  
        /* If still not valid, get a random one */