diff --git a/[refs] b/[refs]
index f430ab344c62..9713d0f8385b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5470b462c3f0c6fa980c320968a165bd0f34ca8d
+refs/heads/master: b34870fc9ff15fe46c4066faeeec437a4e63e2d8
diff --git a/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c b/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c
index 89bef504d9dc..55fe8c9f0484 100644
--- a/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c
+++ b/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c
@@ -1046,11 +1046,10 @@ static inline struct sk_buff *get_packet(struct pci_dev *pdev,
 	const struct freelQ_ce *ce = &fl->centries[fl->cidx];
 
 	if (len < copybreak) {
-		skb = alloc_skb(len + 2, GFP_ATOMIC);
+		skb = netdev_alloc_skb_ip_align(NULL, len);
 		if (!skb)
 			goto use_orig_buf;
 
-		skb_reserve(skb, 2);	/* align IP header */
 		skb_put(skb, len);
 		pci_dma_sync_single_for_cpu(pdev,
 					    dma_unmap_addr(ce, dma_addr),
diff --git a/trunk/tools/testing/selftests/Makefile b/trunk/tools/testing/selftests/Makefile
index 7f50078d0e8c..a4805932972b 100644
--- a/trunk/tools/testing/selftests/Makefile
+++ b/trunk/tools/testing/selftests/Makefile
@@ -5,8 +5,7 @@ TARGETS += vm
 TARGETS += cpu-hotplug
 TARGETS += memory-hotplug
 TARGETS += efivarfs
-TARGETS += net-socket
-TARGETS += net-afpacket
+TARGETS += net
 
 all:
 	for TARGET in $(TARGETS); do \
diff --git a/trunk/tools/testing/selftests/net-socket/Makefile b/trunk/tools/testing/selftests/net-socket/Makefile
deleted file mode 100644
index 2450fd8bb10a..000000000000
--- a/trunk/tools/testing/selftests/net-socket/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Makefile for net-socket selftests
-
-CC = $(CROSS_COMPILE)gcc
-CFLAGS = -Wall
-
-NET_SOCK_PROGS = socket
-
-all: $(NET_SOCK_PROGS)
-%: %.c
-	$(CC) $(CFLAGS) -o $@ $^
-
-run_tests: all
-	@/bin/sh ./run_netsocktests || echo "sockettests: [FAIL]"
-
-clean:
-	$(RM) $(NET_SOCK_PROGS)
diff --git a/trunk/tools/testing/selftests/net-afpacket/Makefile b/trunk/tools/testing/selftests/net/Makefile
similarity index 55%
rename from trunk/tools/testing/selftests/net-afpacket/Makefile
rename to trunk/tools/testing/selftests/net/Makefile
index 45f2ffb7fda7..bd6e272bab87 100644
--- a/trunk/tools/testing/selftests/net-afpacket/Makefile
+++ b/trunk/tools/testing/selftests/net/Makefile
@@ -1,18 +1,19 @@
-# Makefile for net-socket selftests
+# Makefile for net selftests
 
 CC = $(CROSS_COMPILE)gcc
 CFLAGS = -Wall
 
 CFLAGS += -I../../../../usr/include/
 
-AF_PACKET_PROGS = psock_fanout
+NET_PROGS = socket psock_fanout
 
-all: $(AF_PACKET_PROGS)
+all: $(NET_PROGS)
 %: %.c
 	$(CC) $(CFLAGS) -o $@ $^
 
 run_tests: all
+	@/bin/sh ./run_netsocktests || echo "sockettests: [FAIL]"
 	@/bin/sh ./run_afpackettests || echo "afpackettests: [FAIL]"
 
 clean:
-	$(RM) $(AF_PACKET_PROGS)
+	$(RM) $(NET_PROGS)
diff --git a/trunk/tools/testing/selftests/net-afpacket/psock_fanout.c b/trunk/tools/testing/selftests/net/psock_fanout.c
similarity index 100%
rename from trunk/tools/testing/selftests/net-afpacket/psock_fanout.c
rename to trunk/tools/testing/selftests/net/psock_fanout.c
diff --git a/trunk/tools/testing/selftests/net-afpacket/run_afpackettests b/trunk/tools/testing/selftests/net/run_afpackettests
similarity index 100%
rename from trunk/tools/testing/selftests/net-afpacket/run_afpackettests
rename to trunk/tools/testing/selftests/net/run_afpackettests
diff --git a/trunk/tools/testing/selftests/net-socket/run_netsocktests b/trunk/tools/testing/selftests/net/run_netsocktests
similarity index 100%
rename from trunk/tools/testing/selftests/net-socket/run_netsocktests
rename to trunk/tools/testing/selftests/net/run_netsocktests
diff --git a/trunk/tools/testing/selftests/net-socket/socket.c b/trunk/tools/testing/selftests/net/socket.c
similarity index 100%
rename from trunk/tools/testing/selftests/net-socket/socket.c
rename to trunk/tools/testing/selftests/net/socket.c