Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[powerpc.git] / drivers / net / pasemi_mac.c

diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index d670ac7..07eb9b2 100644 (file)
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -80,7 +80,7 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac)
                return -ENOENT;
        }
 
-       maddr = get_property(dn, "mac-address", NULL);
+       maddr = of_get_property(dn, "mac-address", NULL);
        if (maddr == NULL) {
                dev_warn(&pdev->dev,
                         "no mac address in device tree, not configuring\n");
@@ -334,8 +334,6 @@ static void pasemi_mac_replenish_rx_ring(struct net_device *dev)
                        break;
                }
 
-               skb->dev = dev;
-
                dma = pci_map_single(mac->dma_pdev, skb->data, skb->len,
                                     PCI_DMA_FROMDEVICE);
 
@@ -731,16 +729,18 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
        dflags = XCT_MACTX_O | XCT_MACTX_ST | XCT_MACTX_SS | XCT_MACTX_CRC_PAD;
 
        if (skb->ip_summed == CHECKSUM_PARTIAL) {
-               switch (skb->nh.iph->protocol) {
+               const unsigned char *nh = skb_network_header(skb);
+
+               switch (ip_hdr(skb)->protocol) {
                case IPPROTO_TCP:
                        dflags |= XCT_MACTX_CSUM_TCP;
-                       dflags |= XCT_MACTX_IPH((skb->h.raw - skb->nh.raw) >> 2);
-                       dflags |= XCT_MACTX_IPO(skb->nh.raw - skb->data);
+                       dflags |= XCT_MACTX_IPH(skb_network_header_len(skb) >> 2);
+                       dflags |= XCT_MACTX_IPO(nh - skb->data);
                        break;
                case IPPROTO_UDP:
                        dflags |= XCT_MACTX_CSUM_UDP;
-                       dflags |= XCT_MACTX_IPH((skb->h.raw - skb->nh.raw) >> 2);
-                       dflags |= XCT_MACTX_IPO(skb->nh.raw - skb->data);
+                       dflags |= XCT_MACTX_IPH(skb_network_header_len(skb) >> 2);
+                       dflags |= XCT_MACTX_IPO(nh - skb->data);
                        break;
                }
        }