diff for duplicates of <20100713102206.2835.61332.sendpatchset@danny.redhat> diff --git a/a/1.txt b/N1/1.txt index 1a21ea1..347f7d7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -76,9 +76,3 @@ index 7169b9b..fd7f8ac 100644 * @skb: buffer to process -- 1.7.1.1 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index 5177969..1039a2e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -93,12 +93,6 @@ " *\tnetif_receive_skb - process receive buffer from network\n" " *\t@skb: buffer to process\n" "-- \n" - "1.7.1.1\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + 1.7.1.1 -28964ae10586af6296219b5f2a48a35522953bd5128b001acef713d687b8628f +5aff050c71a67c1786c9c1ac36c682f990e56b7fc0fb7c47ac93ec3717ae553c
diff --git a/a/1.txt b/N2/1.txt index 1a21ea1..8b13789 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,84 +1 @@ ->From 50d2e72527b3e821544cc97c4dd5b1e5a44b6659 Mon Sep 17 00:00:00 2001 -From: Xiaotian Feng <dfeng@redhat.com> -Date: Tue, 13 Jul 2010 13:21:10 +0800 -Subject: [PATCH 28/30] build fix for skb_emergency_protocol -Signed-off-by: Xiaotian Feng <dfeng@redhat.com> ---- - net/core/dev.c | 48 ++++++++++++++++++++++++------------------------ - 1 files changed, 24 insertions(+), 24 deletions(-) - -diff --git a/net/core/dev.c b/net/core/dev.c -index 7169b9b..fd7f8ac 100644 ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -2791,6 +2791,30 @@ int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master) - } - EXPORT_SYMBOL(__skb_bond_should_drop); - -+/* -+ * Filter the protocols for which the reserves are adequate. -+ * -+ * Before adding a protocol make sure that it is either covered by the existing -+ * reserves, or add reserves covering the memory need of the new protocol's -+ * packet processing. -+ */ -+static int skb_emergency_protocol(struct sk_buff *skb) -+{ -+ if (skb_emergency(skb)) -+ switch (skb->protocol) { -+ case __constant_htons(ETH_P_ARP): -+ case __constant_htons(ETH_P_IP): -+ case __constant_htons(ETH_P_IPV6): -+ case __constant_htons(ETH_P_8021Q): -+ break; -+ -+ default: -+ return 0; -+ } -+ -+ return 1; -+} -+ - static int __netif_receive_skb(struct sk_buff *skb) - { - struct packet_type *ptype, *pt_prev; -@@ -2942,30 +2966,6 @@ out: - return ret; - } - --/* -- * Filter the protocols for which the reserves are adequate. -- * -- * Before adding a protocol make sure that it is either covered by the existing -- * reserves, or add reserves covering the memory need of the new protocol's -- * packet processing. -- */ --static int skb_emergency_protocol(struct sk_buff *skb) --{ -- if (skb_emergency(skb)) -- switch (skb->protocol) { -- case __constant_htons(ETH_P_ARP): -- case __constant_htons(ETH_P_IP): -- case __constant_htons(ETH_P_IPV6): -- case __constant_htons(ETH_P_8021Q): -- break; -- -- default: -- return 0; -- } -- -- return 1; --} -- - /** - * netif_receive_skb - process receive buffer from network - * @skb: buffer to process --- -1.7.1.1 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index 5177969..10500b3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -16,89 +16,5 @@ " davem@davemloft.net\0" "\00:1\0" "b\0" - ">From 50d2e72527b3e821544cc97c4dd5b1e5a44b6659 Mon Sep 17 00:00:00 2001\n" - "From: Xiaotian Feng <dfeng@redhat.com>\n" - "Date: Tue, 13 Jul 2010 13:21:10 +0800\n" - "Subject: [PATCH 28/30] build fix for skb_emergency_protocol\n" - "\n" - "Signed-off-by: Xiaotian Feng <dfeng@redhat.com>\n" - "---\n" - " net/core/dev.c | 48 ++++++++++++++++++++++++------------------------\n" - " 1 files changed, 24 insertions(+), 24 deletions(-)\n" - "\n" - "diff --git a/net/core/dev.c b/net/core/dev.c\n" - "index 7169b9b..fd7f8ac 100644\n" - "--- a/net/core/dev.c\n" - "+++ b/net/core/dev.c\n" - "@@ -2791,6 +2791,30 @@ int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master)\n" - " }\n" - " EXPORT_SYMBOL(__skb_bond_should_drop);\n" - " \n" - "+/*\n" - "+ * Filter the protocols for which the reserves are adequate.\n" - "+ *\n" - "+ * Before adding a protocol make sure that it is either covered by the existing\n" - "+ * reserves, or add reserves covering the memory need of the new protocol's\n" - "+ * packet processing.\n" - "+ */\n" - "+static int skb_emergency_protocol(struct sk_buff *skb)\n" - "+{\n" - "+\tif (skb_emergency(skb))\n" - "+\t\tswitch (skb->protocol) {\n" - "+\t\tcase __constant_htons(ETH_P_ARP):\n" - "+\t\tcase __constant_htons(ETH_P_IP):\n" - "+\t\tcase __constant_htons(ETH_P_IPV6):\n" - "+\t\tcase __constant_htons(ETH_P_8021Q):\n" - "+\t\t\tbreak;\n" - "+\n" - "+\t\tdefault:\n" - "+\t\t\treturn 0;\n" - "+\t\t}\n" - "+\n" - "+\treturn 1;\n" - "+}\n" - "+\n" - " static int __netif_receive_skb(struct sk_buff *skb)\n" - " {\n" - " \tstruct packet_type *ptype, *pt_prev;\n" - "@@ -2942,30 +2966,6 @@ out:\n" - " \treturn ret;\n" - " }\n" - " \n" - "-/*\n" - "- * Filter the protocols for which the reserves are adequate.\n" - "- *\n" - "- * Before adding a protocol make sure that it is either covered by the existing\n" - "- * reserves, or add reserves covering the memory need of the new protocol's\n" - "- * packet processing.\n" - "- */\n" - "-static int skb_emergency_protocol(struct sk_buff *skb)\n" - "-{\n" - "-\tif (skb_emergency(skb))\n" - "-\t\tswitch (skb->protocol) {\n" - "-\t\tcase __constant_htons(ETH_P_ARP):\n" - "-\t\tcase __constant_htons(ETH_P_IP):\n" - "-\t\tcase __constant_htons(ETH_P_IPV6):\n" - "-\t\tcase __constant_htons(ETH_P_8021Q):\n" - "-\t\t\tbreak;\n" - "-\n" - "-\t\tdefault:\n" - "-\t\t\treturn 0;\n" - "-\t\t}\n" - "-\n" - "-\treturn 1;\n" - "-}\n" - "-\n" - " /**\n" - " *\tnetif_receive_skb - process receive buffer from network\n" - " *\t@skb: buffer to process\n" - "-- \n" - "1.7.1.1\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -28964ae10586af6296219b5f2a48a35522953bd5128b001acef713d687b8628f +8a16b64f25e8ea7e2c7a601e0e88b11cf03822c643dccaa6d1b55495b27d5fe4
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.