aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2010-12-14 10:24:08 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-16 17:43:14 -0500
commit55508d601dab7df5cbcc7a63f4be8620eface204 (patch)
tree346f30fae9c726d2e73aba2e37ce1e4a31dcea8c /drivers
parent04fb451eff978ca059399eab83d5594b073caf6f (diff)
net: Use skb_checksum_start_offset()
Replace skb->csum_start - skb_headroom(skb) with skb_checksum_start_offset(). Note for usb/smsc95xx: skb->data - skb->head == skb_headroom(skb). Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/atlx/atl1.c2
-rw-r--r--drivers/net/macvtap.c3
-rw-r--r--drivers/net/tun.c2
-rw-r--r--drivers/net/usb/smsc95xx.c7
-rw-r--r--drivers/net/virtio_net.c2
5 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 53363108994e..def8df83359c 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2174,7 +2174,7 @@ static int atl1_tx_csum(struct atl1_adapter *adapter, struct sk_buff *skb,
2174 u8 css, cso; 2174 u8 css, cso;
2175 2175
2176 if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) { 2176 if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
2177 css = (u8) (skb->csum_start - skb_headroom(skb)); 2177 css = skb_checksum_start_offset(skb);
2178 cso = css + (u8) skb->csum_offset; 2178 cso = css + (u8) skb->csum_offset;
2179 if (unlikely(css & 0x1)) { 2179 if (unlikely(css & 0x1)) {
2180 /* L1 hardware requires an even number here */ 2180 /* L1 hardware requires an even number here */
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 42567279843e..21845affea13 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -504,8 +504,7 @@ static int macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,
504 504
505 if (skb->ip_summed == CHECKSUM_PARTIAL) { 505 if (skb->ip_summed == CHECKSUM_PARTIAL) {
506 vnet_hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM; 506 vnet_hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
507 vnet_hdr->csum_start = skb->csum_start - 507 vnet_hdr->csum_start = skb_checksum_start_offset(skb);
508 skb_headroom(skb);
509 vnet_hdr->csum_offset = skb->csum_offset; 508 vnet_hdr->csum_offset = skb->csum_offset;
510 } /* else everything is zero */ 509 } /* else everything is zero */
511 510
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 55f3a3e667a9..7599c457abd1 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -757,7 +757,7 @@ static __inline__ ssize_t tun_put_user(struct tun_struct *tun,
757 757
758 if (skb->ip_summed == CHECKSUM_PARTIAL) { 758 if (skb->ip_summed == CHECKSUM_PARTIAL) {
759 gso.flags = VIRTIO_NET_HDR_F_NEEDS_CSUM; 759 gso.flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
760 gso.csum_start = skb->csum_start - skb_headroom(skb); 760 gso.csum_start = skb_checksum_start_offset(skb);
761 gso.csum_offset = skb->csum_offset; 761 gso.csum_offset = skb->csum_offset;
762 } /* else everything is zero */ 762 } /* else everything is zero */
763 763
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 65cb1abfbe57..bc86f4b6ecc2 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -1163,9 +1163,8 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
1163 1163
1164static u32 smsc95xx_calc_csum_preamble(struct sk_buff *skb) 1164static u32 smsc95xx_calc_csum_preamble(struct sk_buff *skb)
1165{ 1165{
1166 int len = skb->data - skb->head; 1166 u16 low_16 = (u16)skb_checksum_start_offset(skb);
1167 u16 high_16 = (u16)(skb->csum_offset + skb->csum_start - len); 1167 u16 high_16 = low_16 + skb->csum_offset;
1168 u16 low_16 = (u16)(skb->csum_start - len);
1169 return (high_16 << 16) | low_16; 1168 return (high_16 << 16) | low_16;
1170} 1169}
1171 1170
@@ -1193,7 +1192,7 @@ static struct sk_buff *smsc95xx_tx_fixup(struct usbnet *dev,
1193 if (skb->len <= 45) { 1192 if (skb->len <= 45) {
1194 /* workaround - hardware tx checksum does not work 1193 /* workaround - hardware tx checksum does not work
1195 * properly with extremely small packets */ 1194 * properly with extremely small packets */
1196 long csstart = skb->csum_start - skb_headroom(skb); 1195 long csstart = skb_checksum_start_offset(skb);
1197 __wsum calc = csum_partial(skb->data + csstart, 1196 __wsum calc = csum_partial(skb->data + csstart,
1198 skb->len - csstart, 0); 1197 skb->len - csstart, 0);
1199 *((__sum16 *)(skb->data + csstart 1198 *((__sum16 *)(skb->data + csstart
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index b6d402806ae6..90a23e410d1b 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -519,7 +519,7 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
519 519
520 if (skb->ip_summed == CHECKSUM_PARTIAL) { 520 if (skb->ip_summed == CHECKSUM_PARTIAL) {
521 hdr->hdr.flags = VIRTIO_NET_HDR_F_NEEDS_CSUM; 521 hdr->hdr.flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
522 hdr->hdr.csum_start = skb->csum_start - skb_headroom(skb); 522 hdr->hdr.csum_start = skb_checksum_start_offset(skb);
523 hdr->hdr.csum_offset = skb->csum_offset; 523 hdr->hdr.csum_offset = skb->csum_offset;
524 } else { 524 } else {
525 hdr->hdr.flags = 0; 525 hdr->hdr.flags = 0;