diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-20 22:49:39 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-21 17:13:23 +0100 |
commit | 69e344227777cad5d66f3ebd8ba87a7859b0ad30 (patch) | |
tree | dc7659524ad0a1119e435a584684ca6117ae2e9d /patches/collateral-evolutions/network/0049-no-pfmemalloc/igb.patch | |
parent | 162762a0b81419284260e0e30563859c9ace4c88 (diff) |
patches: refresh patches on next-20141221backports-20141221
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0049-no-pfmemalloc/igb.patch')
-rw-r--r-- | patches/collateral-evolutions/network/0049-no-pfmemalloc/igb.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/0049-no-pfmemalloc/igb.patch b/patches/collateral-evolutions/network/0049-no-pfmemalloc/igb.patch index 3e33b1ce..fa83535d 100644 --- a/patches/collateral-evolutions/network/0049-no-pfmemalloc/igb.patch +++ b/patches/collateral-evolutions/network/0049-no-pfmemalloc/igb.patch @@ -2,7 +2,7 @@ diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/in index a2d72a8..85d7005 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -6573,8 +6573,10 @@ static bool igb_can_reuse_rx_page(struct +@@ -6567,8 +6567,10 @@ static bool igb_can_reuse_rx_page(struct if (unlikely(page_to_nid(page) != numa_node_id())) return false; @@ -13,7 +13,7 @@ index a2d72a8..85d7005 100644 #if (PAGE_SIZE < 8192) /* if we are only owner of page we can reuse it */ -@@ -6642,8 +6644,12 @@ static bool igb_add_rx_frag(struct igb_r +@@ -6636,8 +6638,12 @@ static bool igb_add_rx_frag(struct igb_r memcpy(__skb_put(skb, size), va, ALIGN(size, sizeof(long))); /* we can reuse buffer as-is, just make sure it is local */ |