Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / net / ps3_gelic_net.c

diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 87d6b8f3630470cce8219a4738352377e9d6cac6..5ecfa4b1e758f7db622700b9cc42452851d5ad78 100644 (file)
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -642,7 +642,7 @@ static inline void gelic_card_disable_rxdmac(struct gelic_card *card)
        status = lv1_net_stop_rx_dma(bus_id(card), dev_id(card), 0);
        if (status)
                dev_err(ctodev(card),
-                       "lv1_net_stop_rx_dma faild, %d\n", status);
+                       "lv1_net_stop_rx_dma failed, %d\n", status);
 }
 
 /**
@@ -660,7 +660,7 @@ static inline void gelic_card_disable_txdmac(struct gelic_card *card)
        status = lv1_net_stop_tx_dma(bus_id(card), dev_id(card), 0);
        if (status)
                dev_err(ctodev(card),
-                       "lv1_net_stop_tx_dma faild, status=%d\n", status);
+                       "lv1_net_stop_tx_dma failed, status=%d\n", status);
 }
 
 /**
@@ -956,9 +956,9 @@ static void gelic_net_pass_skb_up(struct gelic_descr *descr,
                    (!(data_error & GELIC_DESCR_DATA_ERROR_CHK_MASK)))
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                else
-                       skb->ip_summed = CHECKSUM_NONE;
+                       skb_checksum_none_assert(skb);
        } else
-               skb->ip_summed = CHECKSUM_NONE;
+               skb_checksum_none_assert(skb);
 
        /* update netdevice statistics */
        netdev->stats.rx_packets++;