mirror of
https://github.com/genodelabs/genode.git
synced 2025-03-01 04:36:13 +00:00
d426c5e6c2
Ported drivers list and extract all needed source files. This decouples ports according to contrib sources and also enables us to revert lxip to Linux version 3.9, while staying with 3.14 for usb. Fixes #1285
31 lines
886 B
Diff
31 lines
886 B
Diff
diff -r 6e1a0ab143a5 net/core/skbuff.c
|
|
--- a/net/core/skbuff.c Fri Oct 18 12:02:45 2013 +0200
|
|
+++ b/net/core/skbuff.c Fri Oct 18 12:04:07 2013 +0200
|
|
@@ -419,23 +419,9 @@
|
|
unsigned int fragsz = SKB_DATA_ALIGN(length + NET_SKB_PAD) +
|
|
SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
|
|
|
- if (fragsz <= PAGE_SIZE && !(gfp_mask & (__GFP_WAIT | GFP_DMA))) {
|
|
- void *data;
|
|
-
|
|
- if (sk_memalloc_socks())
|
|
- gfp_mask |= __GFP_MEMALLOC;
|
|
-
|
|
- data = __netdev_alloc_frag(fragsz, gfp_mask);
|
|
-
|
|
- if (likely(data)) {
|
|
- skb = build_skb(data, fragsz);
|
|
- if (unlikely(!skb))
|
|
- put_page(virt_to_head_page(data));
|
|
- }
|
|
- } else {
|
|
- skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask,
|
|
- SKB_ALLOC_RX, NUMA_NO_NODE);
|
|
- }
|
|
+ skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask,
|
|
+ SKB_ALLOC_RX, NUMA_NO_NODE);
|
|
+
|
|
if (likely(skb)) {
|
|
skb_reserve(skb, NET_SKB_PAD);
|
|
skb->dev = dev;
|