diff options
Diffstat (limited to 'drivers/net/niu.c')
-rw-r--r-- | drivers/net/niu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 781e368329f9..2541321bad82 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
@@ -6589,7 +6589,7 @@ static u64 niu_compute_tx_flags(struct sk_buff *skb, struct ethhdr *ehdr, | |||
6589 | (ip_proto == IPPROTO_UDP ? | 6589 | (ip_proto == IPPROTO_UDP ? |
6590 | TXHDR_CSUM_UDP : TXHDR_CSUM_SCTP)); | 6590 | TXHDR_CSUM_UDP : TXHDR_CSUM_SCTP)); |
6591 | 6591 | ||
6592 | start = skb_transport_offset(skb) - | 6592 | start = skb_checksum_start_offset(skb) - |
6593 | (pad_bytes + sizeof(struct tx_pkt_hdr)); | 6593 | (pad_bytes + sizeof(struct tx_pkt_hdr)); |
6594 | stuff = start + skb->csum_offset; | 6594 | stuff = start + skb->csum_offset; |
6595 | 6595 | ||
@@ -9917,7 +9917,7 @@ static int niu_suspend(struct pci_dev *pdev, pm_message_t state) | |||
9917 | if (!netif_running(dev)) | 9917 | if (!netif_running(dev)) |
9918 | return 0; | 9918 | return 0; |
9919 | 9919 | ||
9920 | flush_scheduled_work(); | 9920 | flush_work_sync(&np->reset_task); |
9921 | niu_netif_stop(np); | 9921 | niu_netif_stop(np); |
9922 | 9922 | ||
9923 | del_timer_sync(&np->timer); | 9923 | del_timer_sync(&np->timer); |