Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc

[pandora-kernel.git] / drivers / net / ethernet / tile / tilepro.c

diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index 1e2af96..10826d8 100644 (file)
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -177,7 +177,7 @@ struct tile_net_cpu {
        struct tile_net_stats_t stats;
        /* True iff NAPI is enabled. */
        bool napi_enabled;
-       /* True if this tile has succcessfully registered with the IPP. */
+       /* True if this tile has successfully registered with the IPP. */
        bool registered;
        /* True if the link was down last time we tried to register. */
        bool link_down;
@@ -1713,7 +1713,7 @@ static unsigned int tile_net_tx_frags(lepp_frag_t *frags,
                cpa = ((phys_addr_t)pfn << PAGE_SHIFT) + f->page_offset;
                frags[n].cpa_lo = cpa;
                frags[n].cpa_hi = cpa >> 32;
-               frags[n].length = f->size;
+               frags[n].length = skb_frag_size(f);
                frags[n].hash_for_home = hash_for_home;
                n++;
        }