Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / drivers / net / ethernet / myricom / myri10ge / myri10ge.c

diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 337b0cbfd153ef6bdabcbd8f4e26a1b21bfb2b00..c979f38a2e0cb5e758b15d36b9072002a73a0e27 100644 (file)
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -1286,7 +1286,7 @@ myri10ge_vlan_rx(struct net_device *dev, void *addr, struct sk_buff *skb)
 {
        u8 *va;
        struct vlan_ethhdr *veh;
-       struct skb_frag_struct *frag;
+       skb_frag_t *frag;
        __wsum vsum;
 
        va = addr;
@@ -1306,8 +1306,8 @@ myri10ge_vlan_rx(struct net_device *dev, void *addr, struct sk_buff *skb)
                skb->len -= VLAN_HLEN;
                skb->data_len -= VLAN_HLEN;
                frag = skb_shinfo(skb)->frags;
-               frag->page_offset += VLAN_HLEN;
-               skb_frag_size_set(frag, skb_frag_size(frag) - VLAN_HLEN);
+               skb_frag_off_add(frag, VLAN_HLEN);
+               skb_frag_size_sub(frag, VLAN_HLEN);
        }
 }
 
@@ -1318,7 +1318,7 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum)
 {
        struct myri10ge_priv *mgp = ss->mgp;
        struct sk_buff *skb;
-       struct skb_frag_struct *rx_frags;
+       skb_frag_t *rx_frags;
        struct myri10ge_rx_buf *rx;
        int i, idx, remainder, bytes;
        struct pci_dev *pdev = mgp->pdev;
@@ -1351,7 +1351,7 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum)
                return 0;
        }
        rx_frags = skb_shinfo(skb)->frags;
-       /* Fill skb_frag_struct(s) with data from our receive */
+       /* Fill skb_frag_t(s) with data from our receive */
        for (i = 0, remainder = len; remainder > 0; i++) {
                myri10ge_unmap_rx_page(pdev, &rx->info[idx], bytes);
                skb_fill_page_desc(skb, i, rx->info[idx].page,
@@ -1364,8 +1364,8 @@ myri10ge_rx_done(struct myri10ge_slice_state *ss, int len, __wsum csum)
        }
 
        /* remove padding */
-       rx_frags[0].page_offset += MXGEFW_PAD;
-       rx_frags[0].size -= MXGEFW_PAD;
+       skb_frag_off_add(&rx_frags[0], MXGEFW_PAD);
+       skb_frag_size_sub(&rx_frags[0], MXGEFW_PAD);
        len -= MXGEFW_PAD;
 
        skb->len = len;
@@ -2628,7 +2628,7 @@ static netdev_tx_t myri10ge_xmit(struct sk_buff *skb,
        struct myri10ge_slice_state *ss;
        struct mcp_kreq_ether_send *req;
        struct myri10ge_tx_buf *tx;
-       struct skb_frag_struct *frag;
+       skb_frag_t *frag;
        struct netdev_queue *netdev_queue;
        dma_addr_t bus;
        u32 low;
@@ -3037,7 +3037,6 @@ static int myri10ge_set_mac_address(struct net_device *dev, void *addr)
 static int myri10ge_change_mtu(struct net_device *dev, int new_mtu)
 {
        struct myri10ge_priv *mgp = netdev_priv(dev);
-       int error = 0;
 
        netdev_info(dev, "changing mtu from %d to %d\n", dev->mtu, new_mtu);
        if (mgp->running) {
@@ -3049,7 +3048,7 @@ static int myri10ge_change_mtu(struct net_device *dev, int new_mtu)
        } else
                dev->mtu = new_mtu;
 
-       return error;
+       return 0;
 }
 
 /*