The patch titled
netfilter: remove broken macro
has been removed from the -mm tree. Its filename was
netfilter-remove-broken-macro.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: netfilter: remove broken macro
From: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Remove broken and unused macro (parentheses don't add up).
Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
Cc: Patrick McHardy <kaber@xxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/ipv4/netfilter/ip_nat_standalone.c | 6 ------
1 file changed, 6 deletions(-)
diff -puN net/ipv4/netfilter/ip_nat_standalone.c~netfilter-remove-broken-macro net/ipv4/netfilter/ip_nat_standalone.c
--- a/net/ipv4/netfilter/ip_nat_standalone.c~netfilter-remove-broken-macro
+++ a/net/ipv4/netfilter/ip_nat_standalone.c
@@ -44,12 +44,6 @@
#define DEBUGP(format, args...)
#endif
-#define HOOKNAME(hooknum) ((hooknum) == NF_IP_POST_ROUTING ? "POST_ROUTING" \
- : ((hooknum) == NF_IP_PRE_ROUTING ? "PRE_ROUTING" \
- : ((hooknum) == NF_IP_LOCAL_OUT ? "LOCAL_OUT" \
- : ((hooknum) == NF_IP_LOCAL_IN ? "LOCAL_IN" \
- : "*ERROR*")))
-
#ifdef CONFIG_XFRM
static void nat_decode_session(struct sk_buff *skb, struct flowi *fl)
{
_
Patches currently in -mm which might be from m.kozlowski@xxxxxxxxxx are
origin.patch
ppc-m48t35-add-missing-bracket.patch
ppc-cs4218_tdm-remove-extra-brace.patch
fix2-gregkh-driver-modules-state.patch
mips-dbg_io-stray-brackets-fix.patch
git-mtd.patch
sk98lin-debug-build-fix.patch
net-smc91x-add-missing-bracket.patch
git-chelsio.patch
scsi-sic7xxx-stray-bracket-fix.patch
scsi-53c7xx-brackets-fix.patch
sparc64-dma-remove-extra-brackets.patch
h8300-stray-bracket-fix.patch
i2lib-unused-variable-cleanup.patch
make-1-bit-bitfields-unsigned.patch
char-ip2-remove-broken-macro.patch
fs-ufs-add-missing-bracket.patch
m68knommu-scatterlist-add-missing-bracket.patch
fs-reiserfs-add-missing-brackets.patch
video-cyberfb-broken-macro-removal.patch
video-neofb-stray-bracket-fix.patch
video-pm3fb-macros-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
