diff mbox

[next-next,2/6] net: Create net/core/checksum.c

Message ID alpine.DEB.2.02.1404041714360.20534@tomh.mtv.corp.google.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Tom Herbert April 5, 2014, 12:27 a.m. UTC 
New file for skbuff checksum routines. Moved checksum complete
functions from datagram.c.

Signed-off-by: Tom Herbert <therbert@google.com>
---
 net/core/Makefile   |  3 ++-
 net/core/checksum.c | 26 ++++++++++++++++++++++++++
 net/core/datagram.c | 20 --------------------
 3 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 net/core/checksum.c
diff mbox

Patch

diff --git a/net/core/Makefile b/net/core/Makefile
index 826b925..5f7b9f0 100644
--- a/net/core/Makefile
+++ b/net/core/Makefile
@@ -3,7 +3,8 @@ 
 #
 
 obj-y := sock.o request_sock.o skbuff.o iovec.o datagram.o stream.o scm.o \
-	 gen_stats.o gen_estimator.o net_namespace.o secure_seq.o flow_dissector.o
+	 gen_stats.o gen_estimator.o net_namespace.o secure_seq.o flow_dissector.o \
+	 checksum.o
 
 obj-$(CONFIG_SYSCTL) += sysctl_net_core.o
 
diff --git a/net/core/checksum.c b/net/core/checksum.c
new file mode 100644
index 0000000..2954f86
--- /dev/null
+++ b/net/core/checksum.c
@@ -0,0 +1,26 @@ 
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
+
+#include <net/checksum.h>
+
+__sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len)
+{
+	__sum16 sum;
+
+	sum = csum_fold(skb_checksum(skb, 0, len, skb->csum));
+	if (likely(!sum)) {
+		if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE))
+			netdev_rx_csum_fault(skb->dev);
+		skb->ip_summed = CHECKSUM_UNNECESSARY;
+	}
+	return sum;
+}
+EXPORT_SYMBOL(__skb_checksum_complete_head);
+
+__sum16 __skb_checksum_complete(struct sk_buff *skb)
+{
+	return __skb_checksum_complete_head(skb, skb->len);
+}
+EXPORT_SYMBOL(__skb_checksum_complete);
diff --git a/net/core/datagram.c b/net/core/datagram.c
index a16ed7b..e64c2af 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -734,26 +734,6 @@  fault:
 	return -EFAULT;
 }
 
-__sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len)
-{
-	__sum16 sum;
-
-	sum = csum_fold(skb_checksum(skb, 0, len, skb->csum));
-	if (likely(!sum)) {
-		if (unlikely(skb->ip_summed == CHECKSUM_COMPLETE))
-			netdev_rx_csum_fault(skb->dev);
-		skb->ip_summed = CHECKSUM_UNNECESSARY;
-	}
-	return sum;
-}
-EXPORT_SYMBOL(__skb_checksum_complete_head);
-
-__sum16 __skb_checksum_complete(struct sk_buff *skb)
-{
-	return __skb_checksum_complete_head(skb, skb->len);
-}
-EXPORT_SYMBOL(__skb_checksum_complete);
-
 /**
  *	skb_copy_and_csum_datagram_iovec - Copy and checkum skb to user iovec.
  *	@skb: skbuff